2
0
Эх сурвалжийг харах

------------------------------------------------------------------------
r41065 | pierre | 2019-01-25 08:00:58 +0000 (Fri, 25 Jan 2019) | 1 line

Fix compilation (with -st option) of compiler for macos OS target
------------------------------------------------------------------------
--- Merging r41065 into '.':
U compiler/fpcdefs.inc
U compiler/cfileutl.pas
--- Recording mergeinfo for merge of r41065 into '.':
U .
------------------------------------------------------------------------
r41074 | pierre | 2019-01-25 18:35:33 +0000 (Fri, 25 Jan 2019) | 1 line

Add missing ESysEMSGSIZE and ESysEOPNOTSUPP for beos
------------------------------------------------------------------------
--- Merging r41074 into '.':
U rtl/beos/errno.inc
--- Recording mergeinfo for merge of r41074 into '.':
G .

git-svn-id: branches/fixes_3_2@41227 -

pierre 6 жил өмнө
parent
commit
5fa93e2a1e

+ 3 - 0
compiler/cfileutl.pas

@@ -37,6 +37,9 @@ interface
 {$if defined(go32v2) or defined(watcom)}
 {$if defined(go32v2) or defined(watcom)}
       Dos,
       Dos,
 {$endif}
 {$endif}
+{$ifdef macos}
+      macutils,
+{$endif macos}
 {$IFNDEF USE_FAKE_SYSUTILS}
 {$IFNDEF USE_FAKE_SYSUTILS}
       SysUtils,
       SysUtils,
 {$ELSE}
 {$ELSE}

+ 0 - 4
compiler/fpcdefs.inc

@@ -274,10 +274,6 @@
   {$define SUPPORT_SAFECALL}
   {$define SUPPORT_SAFECALL}
 {$endif aarch64}
 {$endif aarch64}
 
 
-{$IFDEF MACOS}
-{$DEFINE USE_FAKE_SYSUTILS}
-{$ENDIF MACOS}
-
 { Stabs is not officially supported on 64 bit targets by gdb, except on Mac OS X
 { Stabs is not officially supported on 64 bit targets by gdb, except on Mac OS X
   (but there we don't support it)
   (but there we don't support it)
 }
 }

+ 3 - 1
rtl/beos/errno.inc

@@ -386,10 +386,12 @@ const
     ESysESRCH       = (B_POSIX_ERROR_BASE + 13);
     ESysESRCH       = (B_POSIX_ERROR_BASE + 13);
     ESysETIMEDOUT   = ord(B_TIMED_OUT);
     ESysETIMEDOUT   = ord(B_TIMED_OUT);
     ESysEXDEV       = ord(B_CROSS_DEVICE_LINK);
     ESysEXDEV       = ord(B_CROSS_DEVICE_LINK);
+    ESysEMSGSIZE     = EMSGSIZE;
+    ESysEOPNOTSUPP   = EOPNOTSUPP;
+
 
 
     {ESysEBADMSG     =    realtime extension POSIX only   }
     {ESysEBADMSG     =    realtime extension POSIX only   }
     {ESysECANCELED   =    async. I/O extension POSIX only }
     {ESysECANCELED   =    async. I/O extension POSIX only }
-    {ESysEMSGSIZE    =    realtime extension POSIX only   }
     {ESysEINPROGRESS =    async. I/O extension POSIX only }
     {ESysEINPROGRESS =    async. I/O extension POSIX only }
 
 
 {***********************************************************************}
 {***********************************************************************}