paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-01 14:29:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Darwin: fix compilation on macOS/AArch64 after 1f328cf3

Browse Source 
No function suffixes there since there's no backward compatibility issue.
This commit is contained in:
Jonas Maebe 2022-07-10 21:31:13 +02:00
parent 3385ce92a2
commit 8c251db2c1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/unix/oscdeclh.inc
View File

@ -34,7 +34,7 @@ const
{$if (defined(linux) and defined(cpu32) and not defined(fs32bit)) or defined(aix)}
suffix64bit = '64';
darwinsuffix64bit = '';
{$elseif defined(darwin_new_iostructs)}
{$elseif defined(darwin_new_iostructs) and (defined(cpui386) or defined(cpux86_64))}
suffix64bit = '';
darwinsuffix64bit = '$INODE64';
{$else}

7
rtl/unix/unxdeclh.inc
View File

@ -17,6 +17,9 @@ type filedesarray=array[0..1] of cint;
{$if defined(darwin) and (defined(cpuarm) or defined(cpuaarch64) or defined(iphonesim) or (defined(MAC_OS_X_VERSION_MIN_REQUIRED) and (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)))}
{$define darwin_new_iostructs}
{$if defined(cpui386) or defined(cpux86_64)}
{$defined darin_new_iostructs_suffix}
{$endif}
{$endif}
{$if defined(solaris) or defined(aix)}
@ -30,7 +33,7 @@ Function fpFlock (fd,mode : longint) : cint; cdecl; external clib name 'flock';
{$if defined(beos) or defined(solaris) }
Function fpfStatFS(Fd:Longint; Info:pstatfs):cint; cdecl; external clib name 'fstatvfs';
{$else beos or solaris }
Function fpfStatFS(Fd:Longint; Info:pstatfs):cint; cdecl; external clib name 'fstatfs'{$ifdef darwin_new_iostructs}+'$INODE64'{$endif};
Function fpfStatFS(Fd:Longint; Info:pstatfs):cint; cdecl; external clib name 'fstatfs'{$ifdef darin_new_iostructs_suffix}+'$INODE64'{$endif};
{$endif beos or solaris }
Function fpfsync (fd : cint) : cint; cdecl; external clib name 'fsync';
@ -38,7 +41,7 @@ Function fpfsync (fd : cint) : cint; cdecl; external clib name 'fsync';
{$if defined(beos) or defined(solaris) }
Function fpStatFS (Path:pchar; Info:pstatfs):cint; cdecl; external clib name 'statvfs';
{$else beos or solaris }
Function fpStatFS (Path:pchar; Info:pstatfs):cint; cdecl; external clib name 'statfs'{$ifdef darwin_new_iostructs}+'$INODE64'{$endif};
Function fpStatFS (Path:pchar; Info:pstatfs):cint; cdecl; external clib name 'statfs'{$ifdef darin_new_iostructs_suffix}+'$INODE64'{$endif};
{$endif beos or solaris }
function pipe (var fildes: filedesarray):cint; cdecl; external clib name 'pipe';