* fexpand defines kept in platform specific sysutils.pp

git-svn-id: trunk@3726 -

rtl/beos/sysutils.pp

@@ -33,6 +33,8 @@ implementation
   uses
     sysconst;
 
+(* Potentially needed FPC_FEXPAND_* defines should be defined here. *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/emx/sysutils.pp

@@ -34,6 +34,9 @@ implementation
   uses
     sysconst;
 
+{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
+{$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/go32v2/sysutils.pp

@@ -33,6 +33,9 @@ implementation
   uses
     sysconst;
 
+{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
+{$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/macos/sysutils.pp

@@ -51,6 +51,12 @@ implementation
 uses
   Dos, Sysconst; // For some included files.
 
+{$DEFINE FPC_FEXPAND_VOLUMES}
+{$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
+{$DEFINE FPC_FEXPAND_DRIVESEP_IS_ROOT}
+{$DEFINE FPC_FEXPAND_NO_DOTS_UPDIR}
+{$DEFINE FPC_FEXPAND_NO_CURDIR}
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/morphos/sysutils.pp

@@ -37,6 +37,10 @@ implementation
 
 uses dos,sysconst;
 
+{$DEFINE FPC_FEXPAND_VOLUMES} (* Full paths begin with drive specification *)
+{$DEFINE FPC_FEXPAND_DRIVESEP_IS_ROOT}
+{$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/netware/sysutils.pp

@@ -71,6 +71,10 @@ implementation
   uses
     sysconst;
 
+{$define FPC_FEXPAND_DRIVES}
+{$define FPC_FEXPAND_VOLUMES}
+{$define FPC_FEXPAND_NO_DEFAULT_PATHS}
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/netwlibc/sysutils.pp

@@ -73,6 +73,10 @@ implementation
   uses
     sysconst;
 
+{$DEFINE FPC_FEXPAND_DRIVES}
+{$DEFINE FPC_FEXPAND_VOLUMES}
+{$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/objpas/sysutils/fina.inc

@@ -96,93 +96,12 @@ end;
 
 {$ifdef Unix}
   Function getenv(name:shortstring):Pchar; external name 'FPC_SYSC_FPGETENV';
-
-  {$DEFINE FPC_FEXPAND_TILDE} { Tilde is expanded to home }
-  {$DEFINE FPC_FEXPAND_GETENVPCHAR} { GetEnv result is a PChar }
-{$endif}
-
-{$if defined(win32) or defined(win64)) or defined(go32v2) or defined(wdosx)}
-  {$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
-  {$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
-{$endif}
-
-{$if defined(wince)}
-  {$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
-  {$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
-{$endif}
-
-{$if defined(morphos) or defined(amiga)}
-  {$DEFINE FPC_FEXPAND_VOLUMES} (* Full paths begin with drive specification *)
-  {$DEFINE FPC_FEXPAND_DRIVESEP_IS_ROOT}
-  {$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
-{$endif }
-
-{$if defined(OS2)}
-  {$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
-  {$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
-  {$DEFINE FPC_FEXPAND_GETENV_PCHAR}
 {$endif}
 
-{$if defined(MACOS)}
-  {$DEFINE FPC_FEXPAND_VOLUMES}
-  {$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
-  {$DEFINE FPC_FEXPAND_DRIVESEP_IS_ROOT}
-  {$DEFINE FPC_FEXPAND_NO_DOTS_UPDIR}
-  {$DEFINE FPC_FEXPAND_NO_CURDIR}
-{$endif defined(MACOS)}
-
-{$if defined(NETWARE)}
-  {$DEFINE FPC_FEXPAND_DRIVES}
-  {$DEFINE FPC_FEXPAND_VOLUMES}
-  {$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
-{$endif defined(NETWARE)}
-
   type
     PathStr=string;
 {$I fexpand.inc}
 
-{$ifdef Unix}
-  {$UNDEF FPC_FEXPAND_GETENVPCHAR}
-  {$UNDEF FPC_FEXPAND_TILDE}
-{$endif}
-
-{$if defined(win32) or defined(win64)) or defined(go32v2) or defined(wdosx)}
-  {$UNDEF FPC_FEXPAND_UNC} (* UNC paths are supported *)
-  {$UNDEF FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
-{$endif}
-
-{$if defined(wince)}
-  {$UNDEF FPC_FEXPAND_NO_DEFAULT_PATHS}
-  {$UNDEF FPC_FEXPAND_UNC} (* UNC paths are supported *)
-{$endif}
-
-{$if defined(morphos) or defined(amiga)}
-  {$UNDEF FPC_FEXPAND_VOLUMES} (* Full paths begin with drive specification *)
-  {$UNDEF FPC_FEXPAND_DRIVESEP_IS_ROOT}
-  {$UNDEF FPC_FEXPAND_NO_DEFAULT_PATHS}
-{$endif }
-
-{$if defined(OS2)}
-  {$UNDEF FPC_FEXPAND_UNC} (* UNC paths are supported *)
-  {$UNDEF FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
-  {$UNDEF FPC_FEXPAND_GETENV_PCHAR}
-{$endif}
-
-{$if defined(MACOS)}
-  {$UNDEF FPC_FEXPAND_VOLUMES}
-  {$UNDEF FPC_FEXPAND_NO_DEFAULT_PATHS}
-  {$UNDEF FPC_FEXPAND_DRIVESEP_IS_ROOT}
-  {$UNDEF FPC_FEXPAND_NO_DOTS_UPDIR}
-  {$UNDEF FPC_FEXPAND_NO_CURDIR}
-{$endif defined(MACOS)}
-
-
-{$if defined(NETWARE)}
-  {$UNDEF FPC_FEXPAND_DRIVES}
-  {$UNDEF FPC_FEXPAND_VOLUMES}
-  {$UNDEF FPC_FEXPAND_NO_DEFAULT_PATHS}
-{$endif defined(NETWARE)}
-
 
 function ExpandFileName (Const FileName : string): String;
 

rtl/os2/sysutils.pp

@@ -34,6 +34,9 @@ implementation
   uses
     sysconst;
 
+{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
+{$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/unix/sysutils.pp

@@ -86,6 +86,9 @@ procedure UnhookSignal(RtlSigNum: Integer; OnlyIfHooked: Boolean = True);
 
 {$Define OS_FILEISREADONLY} // Specific implementation for Unix.
 
+{$DEFINE FPC_FEXPAND_TILDE} { Tilde is expanded to home }
+{$DEFINE FPC_FEXPAND_GETENVPCHAR} { GetEnv result is a PChar }
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/watcom/sysutils.pp

@@ -33,6 +33,9 @@ implementation
   uses
     sysconst;
 
+{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
+{$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/win/sysutils.pp

@@ -70,6 +70,9 @@ end;
 
 {$DEFINE FPC_NOGENERICANSIROUTINES}
 
+{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
+{$DEFINE FPC_FEXPAND_DRIVES} (* Full paths begin with drive specification *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}
 

rtl/wince/sysutils.pp

@@ -57,6 +57,9 @@ implementation
 {$DEFINE FPC_NOGENERICANSIROUTINES}
 {$define HASEXPANDUNCFILENAME}
 
+{$DEFINE FPC_FEXPAND_NO_DEFAULT_PATHS}
+{$DEFINE FPC_FEXPAND_UNC} (* UNC paths are supported *)
+
 { Include platform independent implementation part }
 {$i sysutils.inc}