* DOS unit is ansi-only.

git-svn-id: branches/unicodertl@12188 -

rtl/inc/dos.inc

@@ -16,7 +16,7 @@
 
  **********************************************************************}
 
-procedure DoDirSeparators(var p:RtlString);
+procedure DoDirSeparators(var p:shortstring);
 var
   i : longint;
 begin

rtl/inc/dosh.inc

@@ -57,11 +57,11 @@ Const
 
 Type
 { Needed for LFN Support }
-  ComStr  = RtlString;
-  PathStr = RtlString;
-  DirStr  = RtlString;
-  NameStr = RtlString;
-  ExtStr  = RtlString;
+  ComStr  = String[FileNameLen];
+  PathStr = String[FileNameLen];
+  DirStr  = String[FileNameLen];
+  NameStr = String[FileNameLen];
+  ExtStr  = String[FileNameLen];
 
 {
   filerec.inc contains the definition of the filerec.
@@ -113,7 +113,7 @@ Procedure FindClose(Var f: SearchRec);
 {File}
 Procedure GetFAttr(var f; var attr: word);
 Procedure GetFTime(var f; var time: longint);
-Function  FSearch(path: pathstr; dirlist: RtlString): pathstr;
+Function  FSearch(path: pathstr; dirlist: string): pathstr;
 Function  FExpand(const path: pathstr): pathstr;
 Procedure FSplit(path: pathstr; var dir: dirstr; var name: namestr; var ext: extstr);
 function  GetShortName(var p : String) : boolean;

rtl/inc/fexpand.inc

@@ -50,7 +50,7 @@
  {$DEFINE FPC_FEXPAND_UPDIR_HELPER}
 {$ENDIF FPC_FEXPAND_DIRSEP_IS_UPDIR}
 
-procedure GetDirIO (DriveNr: byte; var Dir: RtlString);
+procedure GetDirIO (DriveNr: byte; var Dir: PathStr);
 
 (* GetDirIO is supposed to return the root of the given drive   *)
 (* in case of an error for compatibility of FExpand with TP/BP. *)

rtl/win/dos.pp

@@ -534,7 +534,7 @@ function GetShortPathName(lpszLongPath:pchar; lpszShortPath:pchar; cchBuffer:DWO
     stdcall; external 'kernel32' name 'GetShortPathNameA';
 
 
-Function FSearch(path: pathstr; dirlist: RtlString): pathstr;
+Function FSearch(path: pathstr; dirlist: string): pathstr;
 var
   p1     : longint;
   s      : searchrec;