From 94db8aae9bb0801ab04448963e0ef47171ada020 Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 29 Oct 2012 19:24:11 +0000
Subject: [PATCH] use "DefaultFormatSettings.DecimalSeparator" to suppress
 warning, "HAS_EXP_TREE" define to handle fcl-passrc expressions

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

diff --git a/wst/trunk/imp_utils.pas b/wst/trunk/imp_utils.pas
index 55e5141b4..a7bdb7fd4 100644
--- a/wst/trunk/imp_utils.pas
+++ b/wst/trunk/imp_utils.pas
@@ -125,7 +125,7 @@ begin
   Result := Value;
   for i := 1 to length(Result) do begin
     if ( Result[i] = '.' ) then
-      Result[i] := DefaultFormatSettings.DecimalSeparator;
+      Result[i] := {$IFDEF HAS_DEFAULT_FORMAT_SETTINGS}DefaultFormatSettings.{$ENDIF}DecimalSeparator;
   end;
 end;
 
diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc
index 7c659a63d..66045ea5d 100644
--- a/wst/trunk/wst_global.inc
+++ b/wst/trunk/wst_global.inc
@@ -51,11 +51,17 @@
       {$IFEND}
     {$IFEND}
     {$IF Defined(FPC_211)}
-      {$DEFINE HAS_FORMAT_SETTINGS}                                              
+      {$DEFINE HAS_FORMAT_SETTINGS}
     {$IFEND}
     {$IFDEF WINDOWS}
       {$DEFINE WST_SEMAPHORE_TIMEOUT}
     {$ENDIF WINDOWS}
+    {$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION >= 20600) }
+      {$DEFINE HAS_DEFAULT_FORMAT_SETTINGS}
+    {$IFEND}
+    {$IF Defined(FPC_FULLVERSION) and (FPC_FULLVERSION > 20601) }
+      {$DEFINE HAS_EXP_TREE}
+    {$IFEND}
   {$ENDIF}
 
   {$IFNDEF FPC}