From 96b63bb1ad5157c2736928164602011a2479f6bc Mon Sep 17 00:00:00 2001 From: inoussa Date: Fri, 25 Apr 2014 19:03:45 +0000 Subject: [PATCH] FPC 2.7.1 compatibility. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2969 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/object_serializer.pas | 18 ++++++++++++++++++ wst/trunk/wst_global.inc | 5 +++++ 2 files changed, 23 insertions(+) diff --git a/wst/trunk/object_serializer.pas b/wst/trunk/object_serializer.pas index 36b30c26f..2de28838f 100644 --- a/wst/trunk/object_serializer.pas +++ b/wst/trunk/object_serializer.pas @@ -1179,6 +1179,15 @@ var {$IFDEF WST_TKHELPER} ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkHelper {$ENDIF WST_TKHELPER} +{$IFDEF WST_TKFILE} + ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkFile +{$ENDIF WST_TKFILE} +{$IFDEF WST_TKCLASSREF} + ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkClassRef +{$ENDIF WST_TKCLASSREF} +{$IFDEF WST_TKPOINTER} + ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;) //tkPointer +{$ENDIF WST_TKPOINTER} ); WriterInfoMap : array[TTypeKind] of TWriterInfo = ( @@ -1216,6 +1225,15 @@ var {$IFDEF WST_TKHELPER} ,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkHelper {$ENDIF WST_TKHELPER} +{$IFDEF WST_TKFILE} + ,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkFile +{$ENDIF WST_TKFILE} +{$IFDEF WST_TKCLASSREF} + ,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkClassRef +{$ENDIF WST_TKCLASSREF} +{$IFDEF WST_TKPOINTER} + ,( Simple : @ErrorProc; Qualified : @ErrorProc ;) //tkPointer +{$ENDIF WST_TKPOINTER} ); {$ENDIF FPC} diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc index 124b8ada9..22f5c6ccc 100644 --- a/wst/trunk/wst_global.inc +++ b/wst/trunk/wst_global.inc @@ -62,6 +62,11 @@ {$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION > 20602) } {$DEFINE HAS_EXP_TREE} {$IFEND} + {$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION >= 20701) } + {$DEFINE WST_TKFILE} + {$DEFINE WST_TKCLASSREF} + {$DEFINE WST_TKPOINTER} + {$IFEND} {$ENDIF} {$IFNDEF FPC}