paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 02:50:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed compilation with -dUSE_SYSUTILS

Browse Source 
git-svn-id: trunk@486 -
This commit is contained in:
Jonas Maebe 2005-06-24 18:34:14 +00:00
parent 1abbfcc698
commit 6a8eddb6ce
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/comphook.pas
View File

@ -148,9 +148,7 @@ const
implementation implementation
uses uses
{$IFDEF USE_SYSUTILS} {$IFNDEF USE_SYSUTILS}
SysUtils,
{$ELSE USE_SYSUTILS}
dos, dos,
{$ENDIF USE_SYSUTILS} {$ENDIF USE_SYSUTILS}
cutils cutils

3
compiler/compiler.pas
View File

@ -235,9 +235,6 @@ function Compile(const cmd:string):longint;
implementation implementation
uses uses
{$IFDEF USE_SYSUTILS}
SysUtils,
{$ENDIF USE_SYSUTILS}
aasmcpu; aasmcpu;
{$ifdef EXTDEBUG} {$ifdef EXTDEBUG}

10
compiler/globals.pas
View File

@ -684,7 +684,11 @@ implementation
PathExists := true; PathExists := true;
exit; exit;
end; end;
{$ifdef USE_SYSUTILS}
F := ExpandFileName(F);
{$else USE_SYSUTILS}
F := FExpand (F); F := FExpand (F);
{$endif USE_SYSUTILS}
I := Pos (DriveSeparator, F); I := Pos (DriveSeparator, F);
if (F [Length (F)] = DirectorySeparator) if (F [Length (F)] = DirectorySeparator)
and (((I = 0) and (Length (F) > 1)) or (I <> Length (F) - 1)) and (((I = 0) and (Length (F) > 1)) or (I <> Length (F) - 1))
@ -1150,7 +1154,11 @@ implementation
currPath:= CurDirRelPath(source_info) currPath:= CurDirRelPath(source_info)
else else
begin begin
{$ifdef USE_SYSUTILS}
currPath:=FixPath(ExpandFileName(currpath),false);
{$else USE_SYSUTILS}
currPath:=FixPath(FExpand(currPath),false); currPath:=FixPath(FExpand(currPath),false);
{$endif USE_SYSUTILS}
if (CurrentDir<>'') and (Copy(currPath,1,length(CurrentDir))=CurrentDir) then if (CurrentDir<>'') and (Copy(currPath,1,length(CurrentDir))=CurrentDir) then
begin begin
{$ifdef AMIGA} {$ifdef AMIGA}
@ -1185,7 +1193,7 @@ implementation
end; end;
end; end;
until findnext(dir) <> 0; until findnext(dir) <> 0;
end end;
{$ELSE USE_SYSUTILS} {$ELSE USE_SYSUTILS}
findfirst(prefix+'*',directory,dir); findfirst(prefix+'*',directory,dir);
while doserror=0 do while doserror=0 do

4
compiler/options.pas
View File

@ -1304,7 +1304,11 @@ begin
Message(option_too_many_cfg_files); Message(option_too_many_cfg_files);
{ open file } { open file }
Message1(option_using_file,filename); Message1(option_using_file,filename);
{$ifdef USE_SYSUTILS}
assign(f,ExpandFileName(filename));
{$else USE_SYSUTILS}
assign(f,FExpand(filename)); assign(f,FExpand(filename));
{$endif USE_SYsUTILS}
{$I-} {$I-}
reset(f); reset(f);
{$I+} {$I+}