Browse Source

* 1.0.x Renamefest for FCL. Fixed some oddities in 1.1 too

marco 23 years ago
parent
commit
43e0c8d957
3 changed files with 11 additions and 14 deletions
  1. 1 1
      fcl/db/dbase/dbf.pas
  2. 5 11
      fcl/inc/ssockets.pp
  3. 5 2
      fcl/tests/testz2.pp

+ 1 - 1
fcl/db/dbase/dbf.pas

@@ -28,7 +28,7 @@ const
    {$define DELPHI_3}
 {$endif}
 
-{$ifdef linux}
+{$ifdef unix}
   DirSeparator = '/';
 {$else}
   DirSeparator = '\';

+ 5 - 11
fcl/inc/ssockets.pp

@@ -148,22 +148,13 @@ type
 Implementation
 
 uses
-{$ifdef linux}
- {$ifndef freebsd}
+{$ifdef unix}
   {$ifdef ver1_0}
     Linux,
   {$else}
     Unix,
   {$endif}
  {$endif}
-{$endif}
-{$ifdef freebsd}
-  {$ifdef ver1_0}
-    Linux,
-  {$else}
-    Unix,
-  {$endif}
-{$endif}
   inet
   ;
 
@@ -524,7 +515,10 @@ end.
 
 {
   $Log$
-  Revision 1.10  2001-12-17 21:03:55  sg
+  Revision 1.11  2002-05-31 11:31:46  marco
+   * 1.0.x Renamefest for FCL. Fixed some oddities in 1.1 too
+
+  Revision 1.10  2001/12/17 21:03:55  sg
   * Fixed merging mistake of my last commit :/
 
   Revision 1.9  2001/12/17 20:21:35  sg

+ 5 - 2
fcl/tests/testz2.pp

@@ -3,7 +3,7 @@ Program testz2;
 uses zstream;
 
 const
-{$ifdef linux}
+{$ifdef unix}
   eol=#10;
 {$else}
   eol=#10#13;
@@ -31,7 +31,10 @@ begin
 end.
 
   $Log$
-  Revision 1.2  2000-07-13 11:33:05  michael
+  Revision 1.3  2002-05-31 11:31:46  marco
+   * 1.0.x Renamefest for FCL. Fixed some oddities in 1.1 too
+
+  Revision 1.2  2000/07/13 11:33:05  michael
   + removed logs
  
 }