From 2da7c3f05cbbafbeda9f3b126db7fa153ca43147 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Mon, 19 Aug 2013 22:04:40 +0000
Subject: [PATCH]   * changed declarations in finah.inc and diskh.inc from
 ansistring to     rawbytestring   * DoDirSeparators() and GetDirs() marked as
 "rtlproc" so they can accept     non-rawbytestring arguments as their
 var-parameters

git-svn-id: branches/cpstrrtl@25306 -
---
 rtl/objpas/sysutils/diskh.inc    | 8 ++++----
 rtl/objpas/sysutils/fina.inc     | 4 ++--
 rtl/objpas/sysutils/finah.inc    | 4 ++--
 rtl/objpas/sysutils/sysutilh.inc | 2 +-
 rtl/objpas/sysutils/sysutils.inc | 2 +-
 rtl/win/sysutils.pp              | 2 +-
 rtl/wince/sysutils.pp            | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rtl/objpas/sysutils/diskh.inc b/rtl/objpas/sysutils/diskh.inc
index de7942713b..0cdc8ae6de 100644
--- a/rtl/objpas/sysutils/diskh.inc
+++ b/rtl/objpas/sysutils/diskh.inc
@@ -17,10 +17,10 @@ Function  DiskFree(drive: byte) : int64;
 Function  DiskSize(drive: byte) : int64;
 Function GetCurrentDir : {$ifdef FPC_UNICODE_RTL}UnicodeString{$else}AnsiString{$endif};
 
-Function SetCurrentDir (Const NewDir : AnsiString) : Boolean;
-Function CreateDir (Const NewDir : AnsiString) : Boolean;
-Function RemoveDir (Const Dir : AnsiString) : Boolean;
-Function ForceDirectories(Const Dir: AnsiString): Boolean;
+Function SetCurrentDir (Const NewDir : RawByteString) : Boolean;
+Function CreateDir (Const NewDir : RawByteString) : Boolean;
+Function RemoveDir (Const Dir : RawByteString) : Boolean;
+Function ForceDirectories(Const Dir: RawByteString): Boolean;
 
 Function SetCurrentDir (Const NewDir : UnicodeString) : Boolean;
 Function CreateDir (Const NewDir : UnicodeString) : Boolean;
diff --git a/rtl/objpas/sysutils/fina.inc b/rtl/objpas/sysutils/fina.inc
index f213214a71..c84707a8cb 100644
--- a/rtl/objpas/sysutils/fina.inc
+++ b/rtl/objpas/sysutils/fina.inc
@@ -346,7 +346,7 @@ begin
   Result:=Result+ExtractFileName(DestName);
 end;
 
-Procedure DoDirSeparators (Var FileName : PathStr);
+Procedure DoDirSeparators (Var FileName : PathStr); {$ifdef FPC_HAS_CPSTRING}rtlproc;{$endif}
 
 VAr I : longint;
 
@@ -371,7 +371,7 @@ end;
   if none were found.
 }
 
-Function GetDirs (Var DirName : PathStr; Var Dirs : Array of PathPChar) : Longint;
+Function GetDirs (Var DirName : PathStr; Var Dirs : Array of PathPChar) : Longint; {$ifdef FPC_HAS_CPSTRING}rtlproc;{$endif}
 
 Var I : Longint;
 
diff --git a/rtl/objpas/sysutils/finah.inc b/rtl/objpas/sysutils/finah.inc
index c7ff08a555..d61ae89721 100644
--- a/rtl/objpas/sysutils/finah.inc
+++ b/rtl/objpas/sysutils/finah.inc
@@ -37,8 +37,8 @@ function ExcludeTrailingPathDelimiter(Const Path: PathStr): PathStr;
 function IncludeLeadingPathDelimiter(Const Path : PathStr) : PathStr;
 function ExcludeLeadingPathDelimiter(Const Path: PathStr): PathStr;
 function IsPathDelimiter(Const Path: PathStr; Index: Integer): Boolean;
-Procedure DoDirSeparators (Var FileName : PathStr);
+Procedure DoDirSeparators (Var FileName : PathStr); {$ifdef FPC_HAS_CPSTRING}rtlproc;{$endif}
 Function SetDirSeparators (Const FileName : PathStr) : PathStr;
-Function GetDirs (Var DirName : PathStr; Var Dirs : Array of PathPChar) : Longint;
+Function GetDirs (Var DirName : PathStr; Var Dirs : Array of PathPChar) : Longint; {$ifdef FPC_HAS_CPSTRING}rtlproc;{$endif}
 function ConcatPaths(const Paths: array of PathStr): PathStr;
 
diff --git a/rtl/objpas/sysutils/sysutilh.inc b/rtl/objpas/sysutils/sysutilh.inc
index e13f2397db..469d3668f3 100644
--- a/rtl/objpas/sysutils/sysutilh.inc
+++ b/rtl/objpas/sysutils/sysutilh.inc
@@ -293,7 +293,7 @@ Type
 {$define PathPChar:=PWideChar}
   { Read filename handling functions declaration }
   {$i finah.inc}
-{$define PathStr:=AnsiString}
+{$define PathStr:=RawByteString}
 {$define PathPChar:=PAnsiChar}
   { Read filename handling functions declaration }
   {$i finah.inc}
diff --git a/rtl/objpas/sysutils/sysutils.inc b/rtl/objpas/sysutils/sysutils.inc
index 47c4b7fe46..9582cecdda 100644
--- a/rtl/objpas/sysutils/sysutils.inc
+++ b/rtl/objpas/sysutils/sysutils.inc
@@ -25,7 +25,7 @@
   { Read disk function implementations }
   {$i disk.inc}
 {$undef SYSUTILSUNICODE}
-{$define PathStr:=AnsiString}
+{$define PathStr:=RawByteString}
 {$define PathPChar:=PAnsiChar}
   { Read filename handling functions implementation }
   {$i fina.inc}
diff --git a/rtl/win/sysutils.pp b/rtl/win/sysutils.pp
index 53a4f22131..bd1e21c9cd 100644
--- a/rtl/win/sysutils.pp
+++ b/rtl/win/sysutils.pp
@@ -183,7 +183,7 @@ begin
 end;
 
 
-function ExpandUNCFileName (const filename:string) : string;
+function ExpandUNCFileName (const filename:rawbytestring) : rawbytestring;
 { returns empty string on errors }
 var
   u: unicodestring;
diff --git a/rtl/wince/sysutils.pp b/rtl/wince/sysutils.pp
index be5a86d981..65a30a0760 100644
--- a/rtl/wince/sysutils.pp
+++ b/rtl/wince/sysutils.pp
@@ -102,7 +102,7 @@ begin
 end;
 
 
-function ExpandUNCFileName (const filename:string) : string;
+function ExpandUNCFileName (const filename:rawbytestring) : rawbytestring;
 var
   u: unicodestring;
 begin