From 6baf007027fd4e374e859d0303f6873c6f5cf92a Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Fri, 17 Feb 2006 05:46:16 +0000
Subject: [PATCH] replaced {$IFDEF windows} by {$IFDEF mswindows}, because fpc
 2.0.2 doesn't define windows

git-svn-id: trunk@8748 -
---
 lcl/fileutil.pas         |  2 +-
 lcl/include/fileutil.inc | 42 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lcl/fileutil.pas b/lcl/fileutil.pas
index 82aae7e90d..af72b0ec7e 100644
--- a/lcl/fileutil.pas
+++ b/lcl/fileutil.pas
@@ -99,7 +99,7 @@ function GetTempFilename(const Path, Prefix: string): string;
 
 implementation
 
-{$IFNDEF windows}
+{$IFNDEF mswindows}
 uses
   Unix, BaseUnix;
 {$ENDIF}
diff --git a/lcl/include/fileutil.inc b/lcl/include/fileutil.inc
index 7a409d236c..108058bf68 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 WINDOWS}
+  {$IFDEF MSWINDOWS}
   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 WINDOWS}
+      {$IFDEF MSWINDOWS}
       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 WINDOWS}
+  {$IFDEF MSWINDOWS}
   // windows
   Result:=FilenameIsWinAbsolute(TheFilename);
   {$ELSE}
@@ -219,7 +219,7 @@ begin
     // check for double path delims
     if (c=PathDelim) then begin
       inc(SrcPos);
-      {$IFDEF WINDOWS}
+      {$IFDEF MSWINDOWS}
       if (DestPos>2)
       {$ELSE}
       if (DestPos>1)
@@ -258,7 +258,7 @@ begin
             //  2. /..     -> skip .., keep /
             inc(SrcPos,2);
             continue;
-          {$IFDEF WINDOWS}
+          {$IFDEF MSWINDOWS}
           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 WINDOWS}
+{$IFNDEF MSWINDOWS}
 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 WINDOWS}
+  {$IFDEF MSWINDOWS}
   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 WINDOWS}
+  {$IFDEF MSWINDOWS}
   Result:=false;
   {$ELSE}
   Result:=(FpReadLink(AFilename)<>'');
@@ -498,7 +498,7 @@ end;
  ------------------------------------------------------------------------------}
 function FileIsReadable(const AFilename: string): boolean;
 begin
-  {$IFDEF WINDOWS}
+  {$IFDEF MSWINDOWS}
   Result:=true;
   {$ELSE}
   Result:= BaseUnix.FpAccess(AFilename,BaseUnix.R_OK)=0;
@@ -510,7 +510,7 @@ end;
  ------------------------------------------------------------------------------}
 function FileIsWritable(const AFilename: string): boolean;
 begin
-  {$IFDEF WINDOWS}
+  {$IFDEF MSWINDOWS}
   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 WINDOWS}
+{$IFDEF MSWINDOWS}
 {$ELSE}
 var
   info: Stat;
@@ -535,7 +535,7 @@ var
 {$ENDIF}
 begin
   Result:='';
-  {$IFDEF WINDOWS}
+  {$IFDEF MSWINDOWS}
 
   {$ELSE}
   if not (FpStat(AFilename,info)=0) then exit;
@@ -620,14 +620,14 @@ end;
  ------------------------------------------------------------------------------}
 function ReadAllLinks(const Filename: string;
   ExceptionOnError: boolean): string;
-{$IFNDEF WINDOWS}
+{$IFNDEF MSWINDOWS}
 var
   LinkFilename: string;
   AText: string;
 {$ENDIF}
 begin
   Result:=Filename;
-  {$IFDEF WINDOWS}
+  {$IFDEF MSWINDOWS}
 
   {$ELSE}
   repeat
@@ -681,7 +681,7 @@ end;
  ------------------------------------------------------------------------------}
 function FileIsExecutable(const AFilename: string): boolean;
 begin
-  {$IFDEF WINDOWS}
+  {$IFDEF MSWINDOWS}
   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 WINDOWS}
+{$IFNDEF MSWINDOWS}
 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 WINDOWS}
+  {$IFNDEF MSWINDOWS}
   if not FileIsExecutable(AFilename) then
   begin
     AText:='"'+AFilename+'"';
@@ -792,7 +792,7 @@ begin
   Result:=ParamStr(0);
   if ExtractFilePath(Result)='' then begin
     // program was started via PATH
-    {$IFDEF windows}
+    {$IFDEF MSWINDOWS}
     Flags:=[];
     {$ELSE}
     Flags:=[sffDontSearchInBasePath];
@@ -946,7 +946,7 @@ begin
       else
         begin
           if FilePos>FileLen then break;
-          {$IFDEF WINDOWS}
+          {$IFDEF MSWINDOWS}
           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 WINDOWS}
+  {$IFDEF MSWINDOWS}
   // 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 WINDOWS}
+  {$IFDEF MSWINDOWS}
   Result:='*.*';
   {$ELSE}
   Result:='*';