Make LCL and LazUtils compile for Amiga systems (NoGUI). Issue #31186, patch from Marcus Sackrow.

git-svn-id: trunk@53853 -

.gitattributes

@@ -2951,6 +2951,7 @@ components/lazutils/LazLoggerIntf.inc svneol=native#text/pascal
 components/lazutils/Makefile svneol=native#text/plain
 components/lazutils/Makefile.compiled svneol=native#text/plain
 components/lazutils/Makefile.fpc svneol=native#text/plain
+components/lazutils/amigalazfileutils.inc svneol=native#text/plain
 components/lazutils/asiancodepagefunctions.inc svneol=native#text/pascal
 components/lazutils/asiancodepages.inc svneol=native#text/pascal
 components/lazutils/avglvltree.pas svneol=native#text/pascal
@@ -7241,6 +7242,7 @@ lcl/include/statusbar.inc svneol=native#text/pascal
 lcl/include/statuspanel.inc svneol=native#text/pascal
 lcl/include/statuspanels.inc svneol=native#text/pascal
 lcl/include/sysenvapis.inc svneol=native#text/pascal
+lcl/include/sysenvapis_amiga.inc svneol=native#text/plain
 lcl/include/sysenvapis_mac.inc svneol=native#text/pascal
 lcl/include/sysenvapis_unix.inc svneol=native#text/pascal
 lcl/include/sysenvapis_win.inc svneol=native#text/pascal

components/codetools/fileprocs.pas

@@ -56,11 +56,11 @@ type
   TFPCMemStreamSeekType = integer;
   PCharZ = Pointer;
 
-{$if defined(Windows) or defined(darwin)}
+{$IF defined(Windows) or defined(darwin) or defined(HASAMIGA)}
 {$define CaseInsensitiveFilenames}
-{$endif}
-{$IF defined(CaseInsensitiveFilenames) or defined(darwin)}
-{$DEFINE NotLiteralFilenames}
+{$ENDIF}
+{$IF defined(CaseInsensitiveFilenames)}
+{$define NotLiteralFilenames}
 {$ENDIF}
 
 const
@@ -364,7 +364,7 @@ function CompareAddrWithCTLineInfoCacheItem(Addr, Item: Pointer): integer;
 implementation
 
 // to get more detailed error messages consider the os
-{$IFnDEF Windows}
+{$IF not (defined(Windows) or defined(HASAMIGA))}
 uses
   Unix;
 {$ENDIF}

components/codetools/ppugraph.pas

@@ -30,12 +30,19 @@ unit PPUGraph;
 interface
 
 uses
-  Classes, SysUtils, dynlibs, PPUParser, CodeTree, AVL_Tree, FileProcs,
+  Classes, SysUtils,
+  {$IFnDEF HASAMIGA}
+  dynlibs,
+  {$ENDIF}
+  PPUParser, CodeTree, AVL_Tree, FileProcs,
   LazFileUtils, BasicCodeTools, CodeGraph, CodeToolManager, CodeToolsStructs;
 
 const
   FPCPPUGroupPrefix = 'fpc_';
-  
+  {$IFDEF HASAMIGA}
+  SharedSuffix = 'library';
+  {$ENDIF}
+
 type
   TPPUGroup = class;
 

components/lazutils/amigalazfileutils.inc

@@ -0,0 +1,330 @@
+{%MainUnit lazfileutils.pas}
+
+function FilenameIsAbsolute(const TheFilename: string):boolean;
+begin
+  Result := Pos(':', TheFilename) > 1;
+end;
+
+function FileOpenUTF8(const FileName: string; Mode: Integer): THandle;
+begin
+  Result := SysUtils.FileOpen(UTF8ToSys(FileName), Mode);
+end;
+
+function FileCreateUTF8(const FileName: string): THandle;
+begin
+  Result := SysUtils.FileCreate(UTF8ToSys(FileName));
+end;
+
+function FileCreateUTF8(const FileName: string; Rights: Cardinal): THandle;
+begin
+  Result := SysUtils.FileCreate(UTF8ToSys(FileName), Rights);
+end;
+
+function FileCreateUtf8(const FileName: String; ShareMode: Integer;
+  Rights: Cardinal): THandle;
+begin
+  Result := SysUtils.FileCreate(UTF8ToSys(FileName), ShareMode, Rights);
+end;
+
+function FileGetAttrUTF8(const FileName: String): Longint;
+begin
+  Result:=SysUtils.FileGetAttr(UTF8ToSys(Filename));
+end;
+
+function FileSetAttrUTF8(const Filename: String; Attr: longint): Longint;
+begin
+  Result:=SysUtils.FileSetAttr(UTF8ToSys(Filename),Attr);
+  InvalidateFileStateCache(Filename);
+end;
+
+function FileExistsUTF8(const Filename: string): boolean;
+begin
+  Result:=SysUtils.FileExists(UTF8ToSys(Filename));
+end;
+
+function DirectoryExistsUTF8(const Directory: string): Boolean;
+begin
+  Result:=SysUtils.DirectoryExists(UTF8ToSys(Directory));
+end;
+
+function FileAgeUTF8(const FileName: string): Longint;
+begin
+  Result:=SysUtils.FileAge(UTF8ToSys(Filename));
+end;
+
+function FileSetDateUTF8(const FileName: String; Age: Longint): Longint;
+begin
+  Result := SysUtils.FileSetDate(UTF8ToSys(Filename), Age);
+  InvalidateFileStateCache(Filename);
+end;
+
+function FileSizeUtf8(const Filename: string): int64;
+var
+  Info: TSearchRec;
+  Str: AnsiString;
+begin
+  Result := 0;
+  Str := Utf8ToAnsi(Filename);
+  if SysUtils.FindFirst (str, faAnyFile and faDirectory, Info) = 0 then
+  begin
+    Result := Info.Size;
+  end;
+  SysUtils.FindClose(Info);
+end;
+
+{------------------------------------------------------------------------------
+  function ReadAllLinks(const Filename: string;
+    ExceptionOnError: boolean): string;
+ ------------------------------------------------------------------------------}
+function ReadAllLinks(const Filename: string;
+  ExceptionOnError: boolean): string;
+begin
+    Result:='';
+end;
+
+function GetPhysicalFilename(const Filename: string;
+  OnError: TPhysicalFilenameOnError): string;
+begin
+  Result:=Filename;
+end;
+
+function CreateDirUTF8(const NewDir: String): Boolean;
+begin
+  Result:=SysUtils.CreateDir(UTF8ToSys(NewDir));
+end;
+
+function RemoveDirUTF8(const Dir: String): Boolean;
+begin
+  Result:=SysUtils.RemoveDir(UTF8ToSys(Dir));
+end;
+
+function DeleteFileUTF8(const FileName: String): Boolean;
+begin
+  Result:=SysUtils.DeleteFile(UTF8ToSys(Filename));
+  if Result then
+    InvalidateFileStateCache;
+end;
+
+function RenameFileUTF8(const OldName, NewName: String): Boolean;
+begin
+  Result:=SysUtils.RenameFile(UTF8ToSys(OldName),UTF8ToSys(NewName));
+  if Result then
+    InvalidateFileStateCache;
+end;
+
+function SetCurrentDirUTF8(const NewDir: String): Boolean;
+begin
+  Result:=SysUtils.SetCurrentDir(UTF8ToSys(NewDir));
+end;
+
+function FindFirstUTF8(const Path: string; Attr: Longint; out Rslt: TSearchRec
+  ): Longint;
+begin
+  Result:=SysUtils.FindFirst(UTF8ToSys(Path),Attr,Rslt);
+  Rslt.Name:=SysToUTF8(Rslt.Name);
+end;
+
+function FindNextUTF8(var Rslt: TSearchRec): Longint;
+begin
+  Rslt.Name:=UTF8ToSys(Rslt.Name);
+  Result:=SysUtils.FindNext(Rslt);
+  Rslt.Name:=SysToUTF8(Rslt.Name);
+end;
+
+
+function ExpandFileNameUTF8(const FileName: string; BaseDir: string): string;
+var
+  IsAbs: Boolean;
+  CurDir, Fn: String;
+begin
+  Fn := FileName;
+  ForcePathDelims(Fn);
+  IsAbs := FileNameIsAbsolute(Fn);
+  if (not IsAbs) then
+  begin
+    CurDir := GetCurrentDirUtf8;
+  end;
+  if IsAbs then
+  begin
+    Result := ResolveDots(Fn);
+  end
+  else
+  begin
+    if (BaseDir = '') then
+      Fn := IncludeTrailingPathDelimiter(CurDir) + Fn
+    else
+      Fn := IncludeTrailingPathDelimiter(BaseDir) + Fn;
+    Fn := ResolveDots(Fn);
+    //if BaseDir is not absolute then this needs to be expanded as well
+    if not FileNameIsAbsolute(Fn) then
+      Fn := ExpandFileNameUtf8(Fn, '');
+    Result := Fn;
+  end;
+end;
+
+function GetCurrentDirUTF8: String;
+begin
+  Result:=SysToUTF8(SysUtils.GetCurrentDir);
+end;
+
+function FileIsExecutable(const AFilename: string): boolean;
+var
+  Fn: string;
+  MyLock: BPTR;
+  Info: TFileInfoBlock;
+begin
+  Result := False;
+  Fn := Utf8ToSys(AFilename);
+  MyLock := AmigaDos.Lock(PChar(Fn), SHARED_LOCK);
+  if PtrUInt(MyLock) <> 0 then
+  begin
+    Examine(MyLock, @Info);
+    Result := (Info.fib_Protection and FIBF_EXECUTE) <> 0;
+    AmigaDos.UnLock(MyLock);
+  end;
+end;
+
+procedure CheckIfFileIsExecutable(const AFilename: string);
+begin
+  // TProcess does not report, if a program can not be executed
+  // to get good error messages consider the OS
+  if not FileExistsUTF8(AFilename) then begin
+    raise Exception.Create(SysUtils.Format(lrsFileDoesNotExist, [AFilename]));
+  end;
+  if DirPathExists(AFilename) then begin
+    raise Exception.Create(SysUtils.Format(lrsFileIsADirectoryAndNotAnExecutable, [
+      AFilename]));
+  end;
+end;
+
+function FileIsSymlink(const AFilename: string): boolean;
+begin
+  Result := False;
+end;
+
+procedure CheckIfFileIsSymlink(const AFilename: string);
+begin
+  // to get good error messages consider the OS
+  if not FileExistsUTF8(AFilename) then begin
+    raise Exception.Create(SysUtils.Format(lrsFileDoesNotExist, [AFilename]));
+  end;
+  if not FileIsSymLink(AFilename) then
+    raise Exception.Create(SysUtils.Format(lrsIsNotASymbolicLink, [AFilename]));
+end;
+
+function FileIsHardLink(const AFilename: string): boolean;
+begin
+  Result := false;
+end;
+
+function FileIsReadable(const AFilename: string): boolean;
+var
+  Fn: string;
+  MyLock: BPTR;
+  Info: TFileInfoBlock;
+begin
+  Result := False;
+  Fn := Utf8ToSys(AFilename);
+  MyLock := AmigaDos.Lock(PChar(Fn), SHARED_LOCK);
+  if PtrUInt(MyLock) <> 0 then
+  begin
+    Examine(MyLock, @Info);
+    Result := (Info.fib_Protection and FIBF_READ) <> 0;
+    AmigaDos.UnLock(MyLock);
+  end;
+end;
+
+function FileIsWritable(const AFilename: string): boolean;
+var
+  Fn: string;
+  MyLock: BPTR;
+  Info: TFileInfoBlock;
+begin
+  Result := False;
+  Fn := Utf8ToSys(AFilename);
+  MyLock := AmigaDos.Lock(PChar(Fn), SHARED_LOCK);
+  if PtrUInt(MyLock) <> 0 then
+  begin
+    Examine(MyLock, @Info);
+    Result := (Info.fib_Protection and FIBF_WRITE) <> 0;
+    AmigaDos.UnLock(MyLock);
+  end;
+end;
+
+
+function IsUNCPath(const Path: String): Boolean;
+begin
+  Result := false;
+end;
+
+function ExtractUNCVolume(const Path: String): String;
+begin
+  Result := '';
+end;
+
+function GetFileDescription(const AFilename: string): string;
+var
+  Fn: string;
+  MyLock: BPTR;
+  Info: TFileInfoBlock;
+begin
+  Result := '';
+  Fn := Utf8ToSys(AFilename);
+  MyLock := AmigaDos.Lock(PChar(Fn), SHARED_LOCK);
+  if PtrUInt(MyLock) <> 0 then
+  begin
+    Examine(MyLock, @Info);
+    if (Info.fib_Protection and FIBF_ARCHIVE) <> 0 then
+      Result := Result + 'a';
+    if (Info.fib_Protection and FIBF_SCRIPT) <> 0 then
+      Result := Result + 's';
+    if (Info.fib_Protection and FIBF_PURE) <> 0 then
+      Result := Result + 'p';
+    if (Info.fib_Protection and FIBF_EXECUTE) <> 0 then
+      Result := Result + 'e';
+    if (Info.fib_Protection and FIBF_READ) <> 0 then
+      Result := Result + 'r';
+    if (Info.fib_Protection and FIBF_WRITE) <> 0 then
+      Result := Result + 'w';
+    if (Info.fib_Protection and FIBF_DELETE) <> 0 then
+      Result := Result + 'd';
+    AmigaDos.UnLock(MyLock);
+  end;
+end;
+
+
+function GetAppConfigDirUTF8(Global: Boolean; Create: boolean = false): string;
+begin
+  Result := SysToUTF8(SysUtils.GetAppConfigDir(Global));
+  if Result = '' then exit;
+  if Create and not ForceDirectoriesUTF8(Result) then
+    raise EInOutError.Create(SysUtils.Format(lrsUnableToCreateConfigDirectoryS,[Result]));
+end;
+
+function GetAppConfigFileUTF8(Global: Boolean; SubDir: boolean;
+  CreateDir: boolean): string;
+var
+  Dir: string;
+begin
+  Result := SysToUTF8(SysUtils.GetAppConfigFile(Global,SubDir));
+  if not CreateDir then exit;
+  Dir := ExtractFilePath(Result);
+  if Dir = '' then exit;
+  if not ForceDirectoriesUTF8(Dir) then
+    raise EInOutError.Create(SysUtils.Format(lrsUnableToCreateConfigDirectoryS,[Dir]));
+end;
+
+function GetShellLinkTarget(const FileName: string): string;
+begin
+  Result := Filename;
+end;
+
+procedure InitLazFileUtils;
+begin
+  //dummy
+end;
+
+procedure FinalizeLazFileUtils;
+begin
+  //dummy
+end;

components/lazutils/fileutil.pas

@@ -29,12 +29,12 @@ interface
 uses
   Classes, SysUtils,
   Masks, LazUTF8, LazFileUtils, StrUtils;
-  
-{$if defined(Windows) or defined(darwin)}
+
+{$IF defined(Windows) or defined(darwin) or defined(HASAMIGA)}
 {$define CaseInsensitiveFilenames}
-{$endif}
+{$ENDIF}
 {$IF defined(CaseInsensitiveFilenames) or defined(darwin)}
-{$DEFINE NotLiteralFilenames}
+{$define NotLiteralFilenames}
 {$ENDIF}
 
 const
@@ -284,14 +284,22 @@ uses
 {$IFDEF windows}
   Windows;
 {$ELSE}
+  {$IFDEF HASAMIGA}
+  AmigaDOS;
+  {$ELSE}
   Unix;
+  {$ENDIF}
 {$ENDIF}
 
 {$I fileutil.inc}
 {$IFDEF windows}
   {$i winfileutil.inc}
 {$ELSE}
+  {$IFDEF HASAMIGA}
+  {$i unixfileutil.inc}   // Reuse UNIX code for Amiga
+  {$ELSE}
   {$i unixfileutil.inc}
+  {$ENDIF}
 {$ENDIF}
 
 end.

components/lazutils/lazfileutils.pas

@@ -16,16 +16,14 @@ interface
 uses
   Classes, SysUtils, SysConst, LazUTF8, LazUtilsStrConsts;
 
-
+{$IF defined(Windows) or defined(darwin) or defined(HASAMIGA)}
+{$define CaseInsensitiveFilenames}
 {$IFDEF Windows}
-  {$define CaseInsensitiveFilenames}
   {$define HasUNCPaths}
 {$ENDIF}
-{$IFDEF darwin}
-  {$define CaseInsensitiveFilenames}
 {$ENDIF}
-{$IF defined(CaseInsensitiveFilenames) or defined(darwin)}
-  {$DEFINE NotLiteralFilenames} // e.g. HFS+ normalizes file names
+{$IF defined(CaseInsensitiveFilenames)}
+  {$define NotLiteralFilenames} // e.g. HFS+ normalizes file names
 {$ENDIF}
 
 function CompareFilenames(const Filename1, Filename2: string): integer; overload;
@@ -168,17 +166,25 @@ uses
 {$IFDEF Windows}
   Windows {$IFnDEF WinCE}, ShlObj, ActiveX, WinDirs{$ENDIF};
 {$ELSE}
-  {$IFDEF darwin}
-  MacOSAll,
+  {$IFDEF HASAMIGA}
+  exec, amigados;
+  {$ELSE}
+    {$IFDEF darwin}
+    MacOSAll,
+    {$ENDIF}
+    Unix, BaseUnix;
   {$ENDIF}
-  Unix, BaseUnix;
 {$ENDIF}
 
 {$I lazfileutils.inc}
 {$IFDEF windows}
   {$I winlazfileutils.inc}
 {$ELSE}
-  {$I unixlazfileutils.inc}
+  {$IFDEF HASAMIGA}
+    {$I amigalazfileutils.inc}
+  {$ELSE}
+    {$I unixlazfileutils.inc}
+  {$ENDIF}
 {$ENDIF}
 
 function CompareFilenames(const Filename1, Filename2: string): integer;
@@ -1026,7 +1032,7 @@ begin
       Start:=Start+Prefix;
     I:=0;
     repeat
-      Result:=Format('%s%.5d.tmp',[Start,I]);
+      Result:=SysUtils.Format('%s%.5d.tmp',[Start,I]);
       Inc(I);
     until not FileExistsUTF8(Result);
   end;

components/lazutils/lazutf8.pas

@@ -224,11 +224,15 @@ begin
   Result:=true;
 end;
 
-{$ifdef windows}
+{$IFDEF windows}
   {$i winlazutf8.inc}
-{$else}
+{$ELSE}
+  {$IFDEF HASAMIGA}
+  {$i unixlazutf8.inc}   // Reuse UNIX code for Amiga
+  {$ELSE}
   {$i unixlazutf8.inc}
-{$endif}
+  {$ENDIF}
+{$ENDIF}
 
 var
   FNeedRTLAnsi: boolean = false;

components/lazutils/lazutf8sysutils.pas

@@ -21,14 +21,16 @@ function GetTickCount64: QWord;
 implementation
 
 uses
-  {$ifdef Windows}
+  {$IFDEF Windows}
     Windows,
-  {$else}
-    Unix, BaseUnix,
-    {$If defined(Linux) and (FPC_FULLVERSION<30000)}
-    Linux,
-    {$EndIf}
-  {$endif}
+  {$ELSE}
+    {$IFnDEF HASAMIGA}
+      Unix, BaseUnix,
+      {$If defined(Linux) and (FPC_FULLVERSION<30000)}
+      Linux,
+      {$EndIf}
+    {$ENDIF}
+  {$ENDIF}
   Classes;
 
 {$IF FPC_FULLVERSION>=30000}
@@ -56,8 +58,8 @@ begin
 end;
 {$ENDIF FPC_FULLVERSION}
 
-{$else WINDOWS}
-{$ifdef UNIX}
+{$ELSE WINDOWS}
+{$IFDEF UNIX}
 Const
 {Date Translation}
   C1970=2440588;
@@ -133,7 +135,7 @@ end;
 {$ENDIF}
 {$ENDIF FPC_FULLVERSION}
 
-{$else UNIX}
+{$ELSE UNIX}
 // Not Windows and not UNIX, so just write the most trivial code until we have something better:
 function NowUTC: TDateTime;
 begin
@@ -146,8 +148,8 @@ begin
   Result := Trunc(Now * 24 * 60 * 60 * 1000);
 end;
 {$ENDIF FPC_FULLVERSION}
-{$endif UNIX}
-{$endif WINDOWS}
+{$ENDIF UNIX}
+{$ENDIF WINDOWS}
 
 end.
 

components/onlinepackagemanager/fpcmod/opkman_httpclient.pas

@@ -335,9 +335,9 @@ Function EncodeURLElement(S : String) : String;
 Function DecodeURLElement(Const S : String) : String;
 
 implementation
-{$if not defined(hasamiga)}
+{$IFnDEF(HASAMIGA)}
 uses sslsockets;
-{$endif}
+{$ENDIF}
 
 resourcestring
   SErrInvalidProtocol = 'Invalid protocol: "%s"';
@@ -545,11 +545,11 @@ begin
   if Assigned(FonGetSocketHandler) then
     FOnGetSocketHandler(Self,UseSSL,Result);
   if (Result=Nil) then
-  {$if not defined(HASAMIGA)}
+  {$IFnDEF(HASAMIGA)}
     If UseSSL then
       Result:=TSSLSocketHandler.Create
     else
-  {$endif}
+  {$ENDIF}
       Result:=TSocketHandler.Create;
 end;
 

lcl/include/sysenvapis_amiga.inc

@@ -0,0 +1,102 @@
+{%MainUnit ../lclintf.pas}
+
+{$I ../../components/lazutils/lazutils_defines.inc} //LCL depends on LazUtils, so this is OK
+
+
+function IsLaunchWinApp(ABrowser: WideString): Boolean;
+begin
+  Result := False;
+end;
+
+//not every AppUserModelID we retrieve using GetDefaultBrowserWideByAppID
+//accepts paramters (e.g. the URL)
+function LaunchWinAppBrowserCanHandleParams(ABrowser: WideString): Boolean;
+begin
+  Result := False;
+end;
+
+function GetDefaultBrowserWideByAppID: WideString;
+begin
+  Result := '';
+end;
+
+function GetDefaultBrowserWideByCmd: WideString;
+begin
+  Result := '';
+end;
+
+
+procedure ExtractBrowserAndParamsWide(const S: WideString; out ABrowser, AParams: WideString);
+begin
+  ABrowser := S;
+  AParams := '%s';
+end;
+
+
+function FindDefaultBrowserWide(out ABrowser, AParams: WideString): Boolean;
+begin
+  ABrowser := '';
+  AParams := '"%s"';
+end;
+
+function FindDefaultBrowserUtf8(out ABrowser, AParams: String): Boolean;
+var
+  QueryRes: String;
+  WideBrowser, WideParams: WideString;
+begin
+  Result := FindDefaultBrowserWide(WideBrowser, WideParams);
+  ABrowser := Utf16ToUtf8(WideBrowser);
+  AParams := Utf16ToUtf8(WideParams);
+end;
+
+function FindDefaultBrowser(out ABrowser, AParams: String): Boolean;
+begin
+  Result := FindDefaultBrowserUtf8(ABrowser, AParams);
+  {$IFDEF ACP_RTL}
+  ABrowser := Utf8ToWinCp(ABrowser);
+  AParams := Utf8ToWinCp(AParams);
+  {$ENDIF ACP_RTL}
+end;
+
+function IsFileUriScheme(const AURL: String): Boolean;
+const
+  FileURIScheme = 'file://';
+begin
+  Result := (CompareText(Copy(AURL,1,Length(FileURIScheme)), FileURIScheme) = 0);
+end;
+
+function IsHtmlWithAnchor(AURL: String): Boolean;
+var
+  AnchorPos, HtmlPos: SizeInt;
+begin
+  Result := False;
+  //Anchor will be defined by last '#' in AURL;
+  AnchorPos := Length(AURL);
+  while (AnchorPos < 0) and (AURL[AnchorPos] <> '#') do Dec(AnchorPos);
+  if (AnchorPos > 0) then
+  begin
+    AURL := UpperCase(AURL); //don't care about UTF8
+    HtmlPos := Pos('.HTM', AURL);
+    if (HtmlPos = 0) then HtmlPos := Pos('.HTML', AURL);
+    Result := (HtmlPos > 0) and (AnchorPos > HtmlPos);
+  end;
+end;
+
+//Currently only used to open a local html file with a specified anchor
+//but in theory should be able to handle all URL's
+function FindDefaultBrowserAndOpenUrl(AURL: String; IsFileURI: Boolean=False{; IsLocalWithAnchor: Boolean=False}): Boolean;
+begin
+  Result := False;
+end;
+
+// Open a given URL with whatever Windows thinks is appropriate
+function OpenURL(AURL: String): Boolean;
+begin
+  Result := False;
+end;
+
+// Open a document with the default application associated with it in the system
+function OpenDocument(APath: String): Boolean;
+begin
+  Result := OpenURL(APath);
+end;

lcl/lclintf.pas

@@ -210,16 +210,19 @@ end;
 // System APIs which have an operating-system specific implementation
 // They should be moved to FPC eventually
 {$I sysenvapis.inc}
-{$ifdef Windows}
+{$IFDEF Windows}
   {$I sysenvapis_win.inc}
-{$endif}
-{$ifdef UNIX}
-  {$ifdef darwin}
+{$ENDIF}
+{$IFDEF HASAMIGA}
+  {$I sysenvapis_amiga.inc}
+{$ENDIF}
+{$IFDEF UNIX}
+  {$IFDEF darwin}
     {$I sysenvapis_mac.inc}
-  {$else}
+  {$ELSE}
     {$I sysenvapis_unix.inc}
-  {$endif}
-{$endif}
+  {$ENDIF}
+{$ENDIF}
 
 procedure InternalInit;
 var