olle 20 lat temu
rodzic
commit
4adda1b1d8
2 zmienionych plików z 24 dodań i 3 usunięć
  1. 22 1
      rtl/macos/dos.pp
  2. 2 2
      rtl/macos/macostp.inc

+ 22 - 1
rtl/macos/dos.pp

@@ -761,7 +761,28 @@ End;
   end;
 
 
-{$IFNDEF USE_FEXPAND_INC}
+{$UNDEF USE_FEXPAND_INC}
+
+{$IFDEF USE_FEXPAND_INC}
+
+//{$DEFINE FPC_FEXPAND_NO_DOTS_UPDIR}
+//{$DEFINE FPC_FEXPAND_NO_CURDIR}
+
+{$DEFINE FPC_FEXPAND_VOLUMES}
+{$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
+{$DEFINE FPC_FEXPAND_DRIVESEP_IS_ROOT}
+
+{ TODO A lot of issues before this works}
+
+{$I fexpand.inc}
+
+{$UNDEF FPC_FEXPAND_VOLUMES}
+{$UNDEF FPC_FEXPAND_NO_DEFAULT_PATHS}
+{$UNDEF FPC_FEXPAND_DRIVESEP_IS_ROOT}
+
+
+
+{$ELSE}
 
 { TODO nonexisting dirs in path's doesnt work (nonexisting files do work)
        example: Writeln('FExpand on :nisse:kalle : ', FExpand(':nisse:kalle')); }

+ 2 - 2
rtl/macos/macostp.inc

@@ -1268,8 +1268,8 @@ type
   C_unsigned_int = Cardinal;
 
 var
-  errno: C_int; external name 'errno';
-  MacOSErr: C_short; external name 'MacOSErr';
+  errno: C_int; external 'StdCLib' name 'errno';
+  MacOSErr: C_short; external 'StdCLib' name 'MacOSErr';
 
 const
   _IOFBF = $00;