paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-15 20:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for win16 target by introducing USE_WINDOWS_UNIT define, which is set for other Windows OSes

Browse Source
This commit is contained in:
Pierre Muller 2025-05-26 11:48:54 +00:00
parent 20fb141ca2
commit b648c6e237
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/rtl-objpas/src/inc/dateutil.inc
View File

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