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

* merged fixed relative path fix

Browse Source
This commit is contained in:
peter 2001-07-15 11:56:21 +00:00
parent 08180516a7
commit efa2d5f05e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/scanner.pas
View File

@ -661,8 +661,15 @@ implementation
found:=false;
foundfile:='';
if path<>'' then
path:=path+';';
found:=FindFile(name+ext,path+current_scanner.inputfile.path^+';.'+DirSep,foundfile);
begin
if not path_absolute(path) then
path:=current_scanner.inputfile.path^+path
else
path:=path+';'+current_scanner.inputfile.path^;
end
else
path:=current_scanner.inputfile.path^;
found:=FindFile(name+ext,path+';.'+DirSep,foundfile);
if (not found) then
found:=current_module.localincludesearchpath.FindFile(name+ext,foundfile);
if (not found) then
@ -2592,7 +2599,10 @@ exit_label:
end.
{
$Log$
Revision 1.19 2001-07-08 21:00:16 peter
Revision 1.20 2001-07-15 11:56:21 peter
* merged fixed relative path fix
Revision 1.19 2001/07/08 21:00:16 peter
* various widestring updates, it works now mostly without charset
mapping supported