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}