pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

FPC 2.5.1 compatibility support(tkHelper handling)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1674 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2011-06-14 10:46:00 +00:00
parent 93a56f6f08
commit b4f37d07e4
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wst/trunk/object_serializer.pas
View File

@ -1176,6 +1176,9 @@ var
,( Simple : @UnicodeStringReader; Qualified : @UnicodeStringReaderQualified ;) //tkUString ,( Simple : @UnicodeStringReader; Qualified : @UnicodeStringReaderQualified ;) //tkUString
,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkUChar ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkUChar
{$ENDIF WST_UNICODESTRING} {$ENDIF WST_UNICODESTRING}
{$IFDEF WST_TKHELPER}
,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkHelper
{$ENDIF WST_TKHELPER}
); );
WriterInfoMap : array[TTypeKind] of TWriterInfo = ( WriterInfoMap : array[TTypeKind] of TWriterInfo = (
@ -1210,7 +1213,9 @@ var
,( Simple : @UnicodeStringWriter; Qualified : @UnicodeStringWriterQualified ;) //tkUString ,( Simple : @UnicodeStringWriter; Qualified : @UnicodeStringWriterQualified ;) //tkUString
,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkUChar ,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkUChar
{$ENDIF WST_UNICODESTRING} {$ENDIF WST_UNICODESTRING}
{$IFDEF WST_TKHELPER}
,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkHelper
{$ENDIF WST_TKHELPER}
); );
{$ENDIF FPC} {$ENDIF FPC}

2
wst/trunk/wst_global.inc
View File

@ -3,6 +3,7 @@
{$UNDEF WST_TKPROCVAR} {$UNDEF WST_TKPROCVAR}
{$UNDEF WST_UNICODESTRING} {$UNDEF WST_UNICODESTRING}
{$UNDEF WST_SEMAPHORE_TIMEOUT} {$UNDEF WST_SEMAPHORE_TIMEOUT}
{$UNDEF WST_TKHELPER}
{$DEFINE WST_HAS_TDURATIONREMOTABLE} {$DEFINE WST_HAS_TDURATIONREMOTABLE}
{$DEFINE WST_HAS_TTIMEREMOTABLE} {$DEFINE WST_HAS_TTIMEREMOTABLE}
@ -32,6 +33,7 @@
) )
} }
{$DEFINE WST_HAS_JSON_INT64} {$DEFINE WST_HAS_JSON_INT64}
{$DEFINE WST_TKHELPER}
{$IFEND} {$IFEND}
{$IF Defined(FPC_VERSION) and (FPC_VERSION = 2) } {$IF Defined(FPC_VERSION) and (FPC_VERSION = 2) }