Browse Source

* Unix renamefest for defines

marco 25 years ago
parent
commit
80c0edc14f
4 changed files with 20 additions and 8 deletions
  1. 5 2
      rtl/objpas/fina.inc
  2. 5 2
      rtl/objpas/finah.inc
  3. 5 2
      rtl/objpas/objpas.pp
  4. 5 2
      rtl/objpas/sysstr.inc

+ 5 - 2
rtl/objpas/fina.inc

@@ -93,7 +93,7 @@ Var S : String;
 Begin
 Begin
  S:=FileName;
  S:=FileName;
  DoDirSeparators(S);
  DoDirSeparators(S);
-{$ifdef linux}
+{$ifdef Unix}
   Result:=Linux.fexpand(S);
   Result:=Linux.fexpand(S);
 {$else}
 {$else}
   Result:=Dos.Fexpand(S);
   Result:=Dos.Fexpand(S);
@@ -188,7 +188,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.2  2000-07-13 11:33:51  michael
+  Revision 1.3  2000-11-13 14:41:20  marco
+   * Unix renamefest for defines
+
+  Revision 1.2  2000/07/13 11:33:51  michael
   + removed logs
   + removed logs
  
  
 }
 }

+ 5 - 2
rtl/objpas/finah.inc

@@ -23,7 +23,7 @@
 
 
 Const
 Const
   DirSeparators : set of char = ['/','\'];  
   DirSeparators : set of char = ['/','\'];  
-{$ifdef Linux}
+{$ifdef Unix}
   OSDirSeparator = '/';
   OSDirSeparator = '/';
 {$else}
 {$else}
   OsDirSeparator = '\';
   OsDirSeparator = '\';
@@ -44,7 +44,10 @@ Function GetDirs (Var DirName : String; Var Dirs : Array of pchar) : Longint;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.2  2000-07-13 11:33:51  michael
+  Revision 1.3  2000-11-13 14:41:20  marco
+   * Unix renamefest for defines
+
+  Revision 1.2  2000/07/13 11:33:51  michael
   + removed logs
   + removed logs
  
  
 }
 }

+ 5 - 2
rtl/objpas/objpas.pp

@@ -15,7 +15,7 @@
  **********************************************************************}
  **********************************************************************}
 {$Mode ObjFpc}
 {$Mode ObjFpc}
 {$I-}
 {$I-}
-{$ifndef linux}
+{$ifndef Unix}
   {$S-}
   {$S-}
 {$endif}
 {$endif}
 unit objpas;
 unit objpas;
@@ -349,7 +349,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.3  2000-07-14 10:33:10  michael
+  Revision 1.4  2000-11-13 14:41:20  marco
+   * Unix renamefest for defines
+
+  Revision 1.3  2000/07/14 10:33:10  michael
   + Conditionals fixed
   + Conditionals fixed
 
 
   Revision 1.2  2000/07/13 11:33:51  michael
   Revision 1.2  2000/07/13 11:33:51  michael

+ 5 - 2
rtl/objpas/sysstr.inc

@@ -476,7 +476,7 @@ j := 0;
 count := Length(S);
 count := Length(S);
 while i < count do begin
 while i < count do begin
    i := i + 1;
    i := i + 1;
-{$ifndef linux}
+{$ifndef Unix}
    if (S[i] = #13) and ((i = count) or (S[i + 1] <> #10)) then
    if (S[i] = #13) and ((i = count) or (S[i + 1] <> #10)) then
      begin
      begin
      result := result + Copy(S, 1 + j, i - j) + #10;
      result := result + Copy(S, 1 + j, i - j) + #10;
@@ -1267,7 +1267,10 @@ const
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.5  2000-09-30 15:51:41  michael
+  Revision 1.6  2000-11-13 14:41:20  marco
+   * Unix renamefest for defines
+
+  Revision 1.5  2000/09/30 15:51:41  michael
   + Merged int64 fix from fixbranch
   + Merged int64 fix from fixbranch
 
 
   Revision 1.1.2.2  2000/09/30 15:07:41  michael
   Revision 1.1.2.2  2000/09/30 15:07:41  michael