Browse Source

* Renamefest

marco 25 years ago
parent
commit
abfa37b122
6 changed files with 34 additions and 16 deletions
  1. 5 2
      rtl/inc/heaptrc.pp
  2. 8 5
      rtl/inc/lineinfo.pp
  3. 6 3
      rtl/inc/objects.pp
  4. 5 2
      rtl/inc/os_types.pp
  5. 5 2
      rtl/inc/socketsh.inc
  6. 5 2
      rtl/inc/systemh.inc

+ 5 - 2
rtl/inc/heaptrc.pp

@@ -636,7 +636,7 @@ end;
                               Check pointer
 *****************************************************************************}
 
-{$ifndef linux}
+{$ifndef Unix}
   {$S-}
 {$endif}
 
@@ -992,7 +992,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.3  2000-08-24 09:01:07  jonas
+  Revision 1.4  2000-11-13 13:40:03  marco
+   * Renamefest
+
+  Revision 1.3  2000/08/24 09:01:07  jonas
     * clear inoutres in traceexit before writing anything (to avoid an RTE
       when writing the heaptrc output when a program didn't handle ioresult)
       (merged from fixes branch)

+ 8 - 5
rtl/inc/lineinfo.pp

@@ -22,7 +22,7 @@ interface
 
 { This is very important as this code can be called
   from inside the RTE 202 error PM }
-{$ifndef linux}
+{$ifndef unix}
   {$S-}
 {$endif}
 
@@ -345,7 +345,7 @@ end;
 {$ENDIF EMX}
 
 
-{$ifdef linux}
+{$ifdef unix}
 function LoadElf32:boolean;
 type
   telf32header=packed record
@@ -425,7 +425,7 @@ begin
    end;
   LoadElf32:=(stabofs<>-1) and (stabstrofs<>-1);
 end;
-{$endif linux}
+{$endif unix}
 
 
 {****************************************************************************
@@ -475,7 +475,7 @@ begin
      exit;
    end;
 {$endif}
-{$ifdef linux}
+{$ifdef unix}
   if LoadElf32 then
    begin
      OpenStabs:=true;
@@ -641,7 +641,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.3  2000-10-14 21:55:07  peter
+  Revision 1.4  2000-11-13 13:40:04  marco
+   * Renamefest
+
+  Revision 1.3  2000/10/14 21:55:07  peter
     * fixed concatting of source and include filenames (merged)
 
   Revision 1.2  2000/07/13 11:33:44  michael

+ 6 - 3
rtl/inc/objects.pp

@@ -54,7 +54,7 @@ UNIT Objects;
 {$E+} { Emulation is on }
 {$X+} { Extended syntax is ok }
 {$R-} { Disable range checking }
-{$ifndef Linux}
+{$ifndef Unix}
   {$S-} { Disable Stack Checking }
 {$endif}
 {$I-} { Disable IO Checking }
@@ -181,7 +181,7 @@ const
    MaxReadBytes = $7fffffff;
    invalidhandle = $ffff;
 {$ENDIF}
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 type
    FNameStr = String;
    { values are words, though the OS calls return 32-bit values }
@@ -2800,7 +2800,10 @@ END;
 END.
 {
   $Log$
-  Revision 1.2  2000-07-13 11:33:44  michael
+  Revision 1.3  2000-11-13 13:40:04  marco
+   * Renamefest
+
+  Revision 1.2  2000/07/13 11:33:44  michael
   + removed logs
  
 }

+ 5 - 2
rtl/inc/os_types.pp

@@ -38,7 +38,7 @@ TYPE
   tOS_UINT = QWord; { 8 byte unsigned ordinal }{ possibly still needs to be defined }
 {$define OS_TYPES}
 {$endif}
-{$ifdef LINUX}
+{$ifdef Unix}
 { TODO - how can we decide if we run on a 32 or a 64 bit linux platform ??? }
   tOS_INT  = LongInt;
   tOS_UINT = DWord;
@@ -65,7 +65,10 @@ IMPLEMENTATION
 end.
 
   $Log$
-  Revision 1.2  2000-07-13 11:33:45  michael
+  Revision 1.3  2000-11-13 13:40:04  marco
+   * Renamefest
+
+  Revision 1.2  2000/07/13 11:33:45  michael
   + removed logs
  
 }

+ 5 - 2
rtl/inc/socketsh.inc

@@ -28,7 +28,7 @@ Const
   PF_UNIX         = AF_UNIX;
   PF_INET         = AF_INET;
 
-{$Ifdef Linux}
+{$Ifdef Unix}
 {$ifndef BSD}
 { For setsockoptions(2) }
          SOL_SOCKET  =   1;
@@ -159,7 +159,10 @@ Function Connect(Sock:longint;const addr:TInetSockAddr;var SockIn,SockOut:file):
 
 {
   $Log$
-  Revision 1.3  2000-09-11 14:53:14  marco
+  Revision 1.4  2000-11-13 13:40:04  marco
+   * Renamefest
+
+  Revision 1.3  2000/09/11 14:53:14  marco
    * FreeBSD adjustments patched in from fixes branch
 
   Revision 1.1.2.1  2000/09/10 16:12:05  marco

+ 5 - 2
rtl/inc/systemh.inc

@@ -36,7 +36,7 @@
 {$P+}
 
 { Stack check gives a note under linux }
-{$ifndef linux}
+{$ifndef unix}
   {$S-}
 {$endif}
 
@@ -484,7 +484,10 @@ const
 
 {
   $Log$
-  Revision 1.11  2000-11-11 16:12:01  peter
+  Revision 1.12  2000-11-13 13:40:04  marco
+   * Renamefest
+
+  Revision 1.11  2000/11/11 16:12:01  peter
     * ptr returns farpointer
 
   Revision 1.10  2000/11/06 21:35:59  peter