Some updates for XE3

nikitayev · Mar 22, 2013 · b70ba68 · b70ba68
1 parent 934923e
commit b70ba68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/ExtPascalSamples/ExtPascalSamples.dpr b/ExtPascalSamples/ExtPascalSamples.dpr
@@ -26,10 +26,16 @@ const
   ServerName = 'ExtPascalSamples';
 
 begin
-  DateSeparator := '/'; ShortDateFormat := 'd/M/yyyy';
-  TimeSeparator := ':'; ShortTimeFormat := 'hh:mm';
+  {$IFDEF VER240}
+  with TFormatSettings do begin
+  {$ENDIF}
+    DateSeparator := '/'; ShortDateFormat := 'd/M/yyyy';
+    TimeSeparator := ':'; ShortTimeFormat := 'hh:mm';
+    DecimalSeparator := '.';
+  {$IFDEF VER240}
+  end;
+  {$ENDIF}
   FileMode      := fmShareDenyWrite + fmOpenReadWrite;
-  DecimalSeparator := '.';
 {$IFDEF DEFAULT}
   Service := TService.Create(ServerName, ExtPascalVersion);
   with Service do try

diff --git a/ExtPascalSamples/Session.pas b/ExtPascalSamples/Session.pas
@@ -41,7 +41,7 @@ function SelfSession : TSession;
 implementation
 
 uses
-  SysUtils, ExtPascalUtils, Ext, ExtForm, StrUtils,
+  SysUtils, ExtPascalUtils, Ext, StrUtils,
   {$IFNDEF WebServer}FCGIApp;{$ELSE}IdExtHTTPServer;{$ENDIF}
 
 function SelfSession : TSession; begin

diff --git a/Services.pas b/Services.pas
@@ -188,7 +188,7 @@ function TService.Stop : integer; begin
 }
 function TService.Start : integer;
 const
-	Param : pchar = nil;
+	Param : pansichar = nil;
 begin
 	Result := 0;
   if FService = 0 then FService := OpenService(FManager, FName, SERVICE_ALL_ACCESS);