paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-17 07:18:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ workaround for non-working dircache on morphos/amiga

Browse Source 
+ added a few more missing morphos defines

git-svn-id: trunk@5980 -
This commit is contained in:
Károly Balogh 2007-01-14 21:32:58 +00:00
parent ad98dc7b06
commit f1067607b6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/cfileutils.pas
View File

@ -24,6 +24,9 @@ unit cfileutils;
{$i fpcdefs.inc} {$i fpcdefs.inc}
{$define usedircache} {$define usedircache}
{$if defined(morphos) or defined(amiga)}
{$undef usedircache}
{$endif}
interface interface
@ -340,7 +343,7 @@ implementation
{$if defined(unix)} {$if defined(unix)}
if (length(s)>0) and (s[1]='/') then if (length(s)>0) and (s[1]='/') then
result:=true; result:=true;
{$elseif defined(amiga)} {$elseif defined(amiga) or defined(morphos)}
if ((length(s)>0) and ((s[1]='\') or (s[1]='/'))) or (Pos(':',s) = length(s)) then if ((length(s)>0) and ((s[1]='\') or (s[1]='/'))) or (Pos(':',s) = length(s)) then
result:=true; result:=true;
{$elseif defined(macos)} {$elseif defined(macos)}
@ -828,7 +831,7 @@ implementation
currPath:=FixPath(ExpandFileName(currpath),false); currPath:=FixPath(ExpandFileName(currpath),false);
if (CurrentDir<>'') and (Copy(currPath,1,length(CurrentDir))=CurrentDir) then if (CurrentDir<>'') and (Copy(currPath,1,length(CurrentDir))=CurrentDir) then
begin begin
{$ifdef AMIGA} {$if defined(amiga) and defined(morphos)}
currPath:= CurrentDir+Copy(currPath,length(CurrentDir)+1,255); currPath:= CurrentDir+Copy(currPath,length(CurrentDir)+1,255);
{$else} {$else}
currPath:= CurDirRelPath(source_info)+Copy(currPath,length(CurrentDir)+1,255); currPath:= CurDirRelPath(source_info)+Copy(currPath,length(CurrentDir)+1,255);

2
compiler/impdef.pas
View File

@ -118,7 +118,7 @@ const
{$ifdef unix} {$ifdef unix}
DirSep = '/'; DirSep = '/';
{$else} {$else}
{$ifdef amiga} {$if defined(amiga) or defined(morphos)}
DirSep = '/'; DirSep = '/';
{$else} {$else}
DirSep = '\'; DirSep = '\';