From df97cd65d9205da38bb223797dc5e8d6dd2c6ae3 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Mon, 19 Aug 2013 22:04:19 +0000
Subject: [PATCH]   * 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 -
---
 rtl/inc/fexpand.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rtl/inc/fexpand.inc b/rtl/inc/fexpand.inc
index d5fbf0aea4..599e47536a 100644
--- a/rtl/inc/fexpand.inc
+++ b/rtl/inc/fexpand.inc
@@ -152,6 +152,8 @@ begin
         Pa := UpCase (Path);
 {$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 *)
 (* by converting all to the native one.           *)
 {$warnings off}
@@ -159,6 +161,7 @@ begin
 	    if CharInSet(Pa [I], AllowDirectorySeparators)  then
 	      Pa [I] := DirectorySeparator;
 {$warnings on}
+{$ENDIF not FPC_FEXPAND_SYSUTILS}
 
 (* PathStart is amount of characters to strip to get beginning *)
 (* of path without volume/drive specification.                 *)