From b4f37d07e407828b96ed345f410bc1e4874588a6 Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 14 Jun 2011 10:46:00 +0000
Subject: [PATCH] FPC 2.5.1 compatibility support(tkHelper handling)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1674 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/object_serializer.pas | 7 ++++++-
 wst/trunk/wst_global.inc        | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wst/trunk/object_serializer.pas b/wst/trunk/object_serializer.pas
index 9a04b5543..36b30c26f 100644
--- a/wst/trunk/object_serializer.pas
+++ b/wst/trunk/object_serializer.pas
@@ -1176,6 +1176,9 @@ var
      ,( Simple : @UnicodeStringReader; Qualified : @UnicodeStringReaderQualified ;)  //tkUString
      ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;)  //tkUChar
 {$ENDIF WST_UNICODESTRING}
+{$IFDEF WST_TKHELPER}
+     ,( Simple : @ErrorFunc; Qualified : @ErrorFunc ;)  //tkHelper
+{$ENDIF WST_TKHELPER}
   );
 
   WriterInfoMap : array[TTypeKind] of TWriterInfo = (
@@ -1210,7 +1213,9 @@ var
      ,( Simple : @UnicodeStringWriter; Qualified : @UnicodeStringWriterQualified ;)  //tkUString
      ,( Simple : @ErrorProc; Qualified : @ErrorProc ;)  //tkUChar
 {$ENDIF WST_UNICODESTRING}
-
+{$IFDEF WST_TKHELPER}
+     ,( Simple : @ErrorProc; Qualified : @ErrorProc ;)  //tkHelper
+{$ENDIF WST_TKHELPER}
   );
 {$ENDIF FPC}
 
diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc
index d844a3ebd..7c659a63d 100644
--- a/wst/trunk/wst_global.inc
+++ b/wst/trunk/wst_global.inc
@@ -3,6 +3,7 @@
 {$UNDEF WST_TKPROCVAR}
 {$UNDEF WST_UNICODESTRING}
 {$UNDEF WST_SEMAPHORE_TIMEOUT}
+{$UNDEF WST_TKHELPER}
 {$DEFINE WST_HAS_TDURATIONREMOTABLE}
 {$DEFINE WST_HAS_TTIMEREMOTABLE}
 
@@ -31,7 +32,8 @@
            )
          )
     }              
-      {$DEFINE WST_HAS_JSON_INT64}  
+      {$DEFINE WST_HAS_JSON_INT64}
+      {$DEFINE WST_TKHELPER}
     {$IFEND}   
 
     {$IF Defined(FPC_VERSION) and (FPC_VERSION = 2)  }