ソースを参照

* don't adjust directory separators in fexpand when we're compiling the
sysutils version, it's already done (in a more efficient way) in
ExpandFileName() before that routine is called

git-svn-id: branches/cpstrrtl@25301 -

Jonas Maebe 12 年 前
コミット
df97cd65d9
1 ファイル変更3 行追加0 行削除
  1. 3 0
      rtl/inc/fexpand.inc

+ 3 - 0
rtl/inc/fexpand.inc

@@ -152,6 +152,8 @@ begin
         Pa := UpCase (Path);
         Pa := UpCase (Path);
 {$ENDIF FPC_FEXPAND_SYSUTILS and not SYSUTILSUNICODE}
 {$ENDIF FPC_FEXPAND_SYSUTILS and not SYSUTILSUNICODE}
 
 
+{ already done before this routine is called from sysutils }
+{$IFNDEF FPC_FEXPAND_SYSUTILS}
 (* Allow both '/' and '\' as directory separators *)
 (* Allow both '/' and '\' as directory separators *)
 (* by converting all to the native one.           *)
 (* by converting all to the native one.           *)
 {$warnings off}
 {$warnings off}
@@ -159,6 +161,7 @@ begin
 	    if CharInSet(Pa [I], AllowDirectorySeparators)  then
 	    if CharInSet(Pa [I], AllowDirectorySeparators)  then
 	      Pa [I] := DirectorySeparator;
 	      Pa [I] := DirectorySeparator;
 {$warnings on}
 {$warnings on}
+{$ENDIF not FPC_FEXPAND_SYSUTILS}
 
 
 (* PathStart is amount of characters to strip to get beginning *)
 (* PathStart is amount of characters to strip to get beginning *)
 (* of path without volume/drive specification.                 *)
 (* of path without volume/drive specification.                 *)