From 4adda1b1d863468e0ebbddfa296777f93cb098b3 Mon Sep 17 00:00:00 2001
From: olle <olle>
Date: Tue, 28 Dec 2004 01:33:19 +0000
Subject: [PATCH]   * minor fix

---
 rtl/macos/dos.pp      | 23 ++++++++++++++++++++++-
 rtl/macos/macostp.inc |  4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/rtl/macos/dos.pp b/rtl/macos/dos.pp
index 09f9e8607b..eb1b6dafed 100644
--- a/rtl/macos/dos.pp
+++ b/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')); }
diff --git a/rtl/macos/macostp.inc b/rtl/macos/macostp.inc
index b4aa2b6b48..9d8b1db02b 100644
--- a/rtl/macos/macostp.inc
+++ b/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;