Explorar el Código

* changes so the compiler can be compiled with a unicode RTL without warnings

git-svn-id: branches/cpstrrtl@25307 -
Jonas Maebe hace 12 años
padre
commit
efa95bed66
Se han modificado 4 ficheros con 4 adiciones y 4 borrados
  1. 1 1
      compiler/assemble.pas
  2. 1 1
      compiler/cfileutl.pas
  3. 1 1
      compiler/globals.pas
  4. 1 1
      compiler/options.pas

+ 1 - 1
compiler/assemble.pas

@@ -295,7 +295,7 @@ Implementation
 
         procedure DeleteFilesWithExt(const AExt:string);
         var
-          dir : TSearchRec;
+          dir : TRawByteSearchRec;
         begin
           if findfirst(s+source_info.dirsep+'*'+AExt,faAnyFile,dir) = 0 then
             begin

+ 1 - 1
compiler/cfileutl.pas

@@ -269,7 +269,7 @@ end;
 
     procedure TCachedDirectory.Reload;
       var
-        dir   : TSearchRec;
+        dir   : TRawByteSearchRec;
         entry : PCachedDirectoryEntry;
       begin
         FreeDirectoryEntries;

+ 1 - 1
compiler/globals.pas

@@ -877,7 +877,7 @@ implementation
       {$endif}
       {$ifdef mswindows}
         GetEnvPchar:=nil;
-        p:=GetEnvironmentStrings;
+        p:=GetEnvironmentStringsA;
         hp:=p;
         while hp^<>#0 do
          begin

+ 1 - 1
compiler/options.pas

@@ -3181,7 +3181,7 @@ begin
   { Add exepath if the exe is not in the current dir, because that is always searched already.
     Do not add it when linking on the target because then we can maybe already find
     .o files that are not for the target }
-  if (ExePath<>GetCurrentDir) and
+  if (ExePath<>cfileutl.GetCurrentDir) and
      not(cs_link_on_target in init_settings.globalswitches) then
    UnitSearchPath.AddPath(ExePath,false);
   { Add unit dir to the object and library path }