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

tfexpand: fixed some AMIGA vs. HASAMIGA defines, fixed DriveSep definition for Amiga systems

Browse Source 
git-svn-id: trunk@30774 -
This commit is contained in:
Károly Balogh 2015-05-03 11:35:07 +00:00
parent 7849ffecf7
commit 99421ba032
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/test/units/dos/tfexpand.pp
View File

@ -110,13 +110,13 @@ const
DriveSeparator = '/'; DriveSeparator = '/';
FileNameCasePreserving = true; FileNameCasePreserving = true;
{$ELSE UNIX} {$ELSE UNIX}
{$IFDEF AMIGA} {$IFDEF HASAMIGA}
DirectorySeparator = ':'; DirectorySeparator = '/';
FileNameCasePreserving = true; FileNameCasePreserving = true;
{$ELSE AMIGA} {$ELSE HASAMIGA}
DirectorySeparator = '\'; DirectorySeparator = '\';
FileNameCasePreserving = false; FileNameCasePreserving = false;
{$ENDIF AMIGA} {$ENDIF HASAMIGA}
{$ENDIF UNIX} {$ENDIF UNIX}
{$ENDIF MACOS} {$ENDIF MACOS}
{$ENDIF DIRECT} {$ENDIF DIRECT}
@ -124,11 +124,7 @@ const
{$IFDEF MACOS} {$IFDEF MACOS}
DriveSep = ''; DriveSep = '';
{$ELSE MACOS} {$ELSE MACOS}
{$IFDEF AMIGA}
DriveSep = '';
{$ELSE AMIGA}
DriveSep = DriveSeparator; DriveSep = DriveSeparator;
{$ENDIF AMIGA}
{$ENDIF MACOS} {$ENDIF MACOS}
{$IFDEF UNIX} {$IFDEF UNIX}
CDrive = ''; CDrive = '';
@ -136,11 +132,11 @@ const
{$IFDEF MACOS} {$IFDEF MACOS}
CDrive = 'C'; CDrive = 'C';
{$ELSE MACOS} {$ELSE MACOS}
{$IFDEF AMIGA} {$IFDEF HASAMIGA}
CDrive = 'C'; CDrive = 'C';
{$ELSE AMIGA} {$ELSE HASAMIGA}
CDrive = 'C:'; CDrive = 'C:';
{$ENDIF AMIGA} {$ENDIF HASAMIGA}
{$ENDIF MACOS} {$ENDIF MACOS}
{$ENDIF UNIX} {$ENDIF UNIX}
{$ENDIF FPC} {$ENDIF FPC}
@ -298,9 +294,9 @@ begin
Check (' ', CurDir + DirSep + ' '); Check (' ', CurDir + DirSep + ' ');
{$IFDEF HASAMIGA} {$IFDEF HASAMIGA}
Check ('', CurDir); Check ('', CurDir);
{$ELSE AMIGA} {$ELSE HASAMIGA}
Check ('', CurDir + DirSep); Check ('', CurDir + DirSep);
{$ENDIF AMIGA} {$ENDIF HASAMIGA}
{$IFDEF MACOS} {$IFDEF MACOS}
Check (':', CurDir + DirSep); Check (':', CurDir + DirSep);
{$ELSE MACOS} {$ELSE MACOS}
@ -519,7 +515,7 @@ if CDir [Length (CDir)] = DirSep then Check ('c:anything', CDir + 'anything')
{$ELSE NODOTS} {$ELSE NODOTS}
Check ('.', CurDir); Check ('.', CurDir);
{$ENDIF NODOTS} {$ENDIF NODOTS}
{$ENDIF AMIGA} {$ENDIF HASAMIGA}
{$ENDIF VOLUMES} {$ENDIF VOLUMES}
Erase (F); Erase (F);
{$IFNDEF NODRIVEC} {$IFNDEF NODRIVEC}