From 5afec4ebb6de9bed56b1f542df743a58c6f7abf1 Mon Sep 17 00:00:00 2001 From: vincents Date: Thu, 16 Feb 2006 22:38:20 +0000 Subject: [PATCH] replaced {$IFDEF win32} by {$IFDEF windows} to compile for wince target git-svn-id: trunk@8747 - --- lcl/fileutil.pas | 2 +- lcl/include/fileutil.inc | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lcl/fileutil.pas b/lcl/fileutil.pas index 835eb5c6f1..82aae7e90d 100644 --- a/lcl/fileutil.pas +++ b/lcl/fileutil.pas @@ -99,7 +99,7 @@ function GetTempFilename(const Path, Prefix: string): string; implementation -{$IFNDEF win32} +{$IFNDEF windows} uses Unix, BaseUnix; {$ENDIF} diff --git a/lcl/include/fileutil.inc b/lcl/include/fileutil.inc index b10dde1b98..7a409d236c 100644 --- a/lcl/include/fileutil.inc +++ b/lcl/include/fileutil.inc @@ -39,7 +39,7 @@ end; ------------------------------------------------------------------------------} function CompareFilenames(const Filename1, Filename2: string): integer; begin - {$IFDEF WIN32} + {$IFDEF WINDOWS} Result:=AnsiCompareText(Filename1, Filename2); {$ELSE} Result:=AnsiCompareStr(Filename1, Filename2); @@ -88,7 +88,7 @@ begin Result:=0; i:=1; while (Result=0) and ((i<=Len1) and (i<=Len2)) do begin - {$IFDEF Win32} + {$IFDEF WINDOWS} Result:=Ord(LowerCaseTable[Ord(Filename1[i])]) -Ord(LowerCaseTable[Ord(Filename2[i])]); //!! Must be replaced by ansi characters !! {$ELSE} @@ -107,7 +107,7 @@ end; ------------------------------------------------------------------------------} function FilenameIsAbsolute(const TheFilename: string):boolean; begin - {$IFDEF win32} + {$IFDEF WINDOWS} // windows Result:=FilenameIsWinAbsolute(TheFilename); {$ELSE} @@ -219,7 +219,7 @@ begin // check for double path delims if (c=PathDelim) then begin inc(SrcPos); - {$IFDEF win32} + {$IFDEF WINDOWS} if (DestPos>2) {$ELSE} if (DestPos>1) @@ -258,7 +258,7 @@ begin // 2. /.. -> skip .., keep / inc(SrcPos,2); continue; - {$IFDEF win32} + {$IFDEF WINDOWS} end else if (DestPos=3) and (Result[2]=':') and (Result[1] in ['a'..'z','A'..'Z']) then begin // 3. C:.. -> copy @@ -447,7 +447,7 @@ end; procedure CheckIfFileIsSymlink(const AFilename: string); ------------------------------------------------------------------------------} procedure CheckIfFileIsSymlink(const AFilename: string); -{$IFNDEF win32} +{$IFNDEF WINDOWS} var AText: string; {$ENDIF} @@ -456,7 +456,7 @@ begin if not FileExists(AFilename) then begin raise Exception.Create('file "'+AFilename+'" does not exist'); end; - {$IFDEF win32} + {$IFDEF WINDOWS} raise Exception.Create('"'+AFilename+'" is not symlink'); {$ELSE} if FpReadLink(AFilename)='' then begin @@ -486,7 +486,7 @@ end; ------------------------------------------------------------------------------} function FileIsSymlink(const AFilename: string): boolean; begin - {$IFDEF win32} + {$IFDEF WINDOWS} Result:=false; {$ELSE} Result:=(FpReadLink(AFilename)<>''); @@ -498,7 +498,7 @@ end; ------------------------------------------------------------------------------} function FileIsReadable(const AFilename: string): boolean; begin - {$IFDEF win32} + {$IFDEF WINDOWS} Result:=true; {$ELSE} Result:= BaseUnix.FpAccess(AFilename,BaseUnix.R_OK)=0; @@ -510,7 +510,7 @@ end; ------------------------------------------------------------------------------} function FileIsWritable(const AFilename: string): boolean; begin - {$IFDEF win32} + {$IFDEF WINDOWS} Result:=((FileGetAttr(AFilename) and faReadOnly)=0); {$ELSE} Result:= BaseUnix.FpAccess(AFilename,BaseUnix.W_OK)=0; @@ -521,7 +521,7 @@ end; GetFileDescription ------------------------------------------------------------------------------} function GetFileDescription(const AFilename: string): string; -{$IFDEF win32} +{$IFDEF WINDOWS} {$ELSE} var info: Stat; @@ -535,7 +535,7 @@ var {$ENDIF} begin Result:=''; - {$IFDEF win32} + {$IFDEF WINDOWS} {$ELSE} if not (FpStat(AFilename,info)=0) then exit; @@ -620,14 +620,14 @@ end; ------------------------------------------------------------------------------} function ReadAllLinks(const Filename: string; ExceptionOnError: boolean): string; -{$IFNDEF win32} +{$IFNDEF WINDOWS} var LinkFilename: string; AText: string; {$ENDIF} begin Result:=Filename; - {$IFDEF win32} + {$IFDEF WINDOWS} {$ELSE} repeat @@ -681,7 +681,7 @@ end; ------------------------------------------------------------------------------} function FileIsExecutable(const AFilename: string): boolean; begin - {$IFDEF win32} + {$IFDEF WINDOWS} Result:=FileExists(AFilename); {$ELSE} Result:= BaseUnix.FpAccess(AFilename,BaseUnix.X_OK)=0; @@ -692,7 +692,7 @@ end; procedure CheckIfFileIsExecutable(const AFilename: string); ------------------------------------------------------------------------------} procedure CheckIfFileIsExecutable(const AFilename: string); -{$IFNDEF win32} +{$IFNDEF WINDOWS} var AText: string; {$ENDIF} begin @@ -704,7 +704,7 @@ begin if DirPathExists(AFilename) then begin raise Exception.Create('file "'+AFilename+'" is a directory and not an executable'); end; - {$IFNDEF win32} + {$IFNDEF WINDOWS} if not FileIsExecutable(AFilename) then begin AText:='"'+AFilename+'"'; @@ -946,7 +946,7 @@ begin else begin if FilePos>FileLen then break; - {$IFDEF win32} + {$IFDEF WINDOWS} if UpperCaseTable[byte(MaskChar)] =UpperCaseTable[byte(TrimmedFile[FilePos])] then {$ELSE} @@ -1158,7 +1158,7 @@ begin if not FileExists(Filename) then exit; // check every directory and filename StartPos:=1; - {$IFDEF Win32} + {$IFDEF WINDOWS} // uppercase Drive letter and skip it if ((length(Result)>=2) and (Result[1] in ['A'..'Z','a'..'z']) and (Result[2]=':')) then begin @@ -1219,7 +1219,7 @@ end; function GetAllFilesMask: string; begin - {$IFDEF win32} + {$IFDEF WINDOWS} Result:='*.*'; {$ELSE} Result:='*';