|
@@ -21,7 +21,6 @@ unit DateUtils;
|
|
|
|
|
|
interface
|
|
interface
|
|
|
|
|
|
-
|
|
|
|
{$ifndef FPUNONE}
|
|
{$ifndef FPUNONE}
|
|
{$IFDEF FPC_DOTTEDUNITS}
|
|
{$IFDEF FPC_DOTTEDUNITS}
|
|
uses
|
|
uses
|
|
@@ -634,15 +633,21 @@ type
|
|
|
|
|
|
implementation
|
|
implementation
|
|
|
|
|
|
|
|
+{$ifdef windows}
|
|
|
|
+ {$ifndef win16}
|
|
|
|
+ {$define USE_WINDOWS_UNIT}
|
|
|
|
+ {$endif not win16}
|
|
|
|
+{$endif windows}
|
|
|
|
+
|
|
{$IFDEF FPC_DOTTEDUNITS}
|
|
{$IFDEF FPC_DOTTEDUNITS}
|
|
uses
|
|
uses
|
|
{$IFDEF UNIX} UnixApi.Unix, {$ENDIF}
|
|
{$IFDEF UNIX} UnixApi.Unix, {$ENDIF}
|
|
- {$IFDEF WINDOWS} WinApi.Windows, {$ENDIF}
|
|
|
|
|
|
+ {$IFDEF USE_WINDOWS_UNIT} WinApi.Windows, {$ENDIF}
|
|
System.SysConst;
|
|
System.SysConst;
|
|
{$ELSE FPC_DOTTEDUNITS}
|
|
{$ELSE FPC_DOTTEDUNITS}
|
|
uses
|
|
uses
|
|
{$IFDEF UNIX} Unix, {$ENDIF}
|
|
{$IFDEF UNIX} Unix, {$ENDIF}
|
|
- {$IFDEF WINDOWS} Windows, {$ENDIF}
|
|
|
|
|
|
+ {$IFDEF USE_WINDOWS_UNIT} Windows, {$ENDIF}
|
|
sysconst;
|
|
sysconst;
|
|
{$ENDIF FPC_DOTTEDUNITS}
|
|
{$ENDIF FPC_DOTTEDUNITS}
|
|
|
|
|
|
@@ -3782,7 +3787,7 @@ end;
|
|
|
|
|
|
function TLocalTimeZone.DoGetID(): string;
|
|
function TLocalTimeZone.DoGetID(): string;
|
|
|
|
|
|
-{$IFDEF WINDOWS}
|
|
|
|
|
|
+{$IFDEF USE_WINDOWS_UNIT}
|
|
var
|
|
var
|
|
lInfo: TTimeZoneInformation;
|
|
lInfo: TTimeZoneInformation;
|
|
Name : UnicodeString;
|
|
Name : UnicodeString;
|
|
@@ -3791,7 +3796,7 @@ var
|
|
var
|
|
var
|
|
lInfo : TTZInfoEx;
|
|
lInfo : TTZInfoEx;
|
|
{$ENDIF}
|
|
{$ENDIF}
|
|
-{$IF NOT (DEFINED(WINDOWS) OR DEFINED(UNIX))}
|
|
|
|
|
|
+{$IF NOT (DEFINED(USE_WINDOWS_UNIT) OR DEFINED(UNIX))}
|
|
var
|
|
var
|
|
lTZEnv : String;
|
|
lTZEnv : String;
|
|
I : integer;
|
|
I : integer;
|
|
@@ -3802,7 +3807,7 @@ begin
|
|
lInfo:=GetTZInfoEx;
|
|
lInfo:=GetTZInfoEx;
|
|
Result:=lInfo.Name[false];
|
|
Result:=lInfo.Name[false];
|
|
{$ENDIF}
|
|
{$ENDIF}
|
|
- {$IFDEF WINDOWS}
|
|
|
|
|
|
+ {$IFDEF USE_WINDOWS_UNIT}
|
|
lInfo:=Default(TTimeZoneInformation);
|
|
lInfo:=Default(TTimeZoneInformation);
|
|
GetTimeZoneInformation(lInfo);
|
|
GetTimeZoneInformation(lInfo);
|
|
Name:=StrPas(@lInfo.StandardName);
|
|
Name:=StrPas(@lInfo.StandardName);
|