Browse Source

* Renamefest for 1.0, many 1.1.x spots patched also.

marco 23 years ago
parent
commit
7e95bd3630

+ 7 - 16
packages/base/gdbint/gdbint.pp

@@ -184,12 +184,9 @@ interface
 {$ifdef go32v2}
   {$define supportexceptions}
 {$endif go32v2}
-{$ifdef linux}
+{$ifdef unix}
   {$define supportexceptions}
-{$endif linux}
-{$ifdef freebsd}
-   {$define supportexceptions}
-{$endif}
+{$endif unix}
 
 {$ifdef NotImplemented}
   {$fatal This OS is not yet supported !!!}
@@ -455,22 +452,13 @@ uses
 {$ifdef win32}
   initc,
 {$endif win32}
-{$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}
 {$ifdef go32v2}
   go32,
   dpmiexcp,
@@ -2561,7 +2549,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2002-05-13 13:45:35  peter
+  Revision 1.6  2002-05-31 11:54:32  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.5  2002/05/13 13:45:35  peter
     * updated to compile tests with kylix
 
   Revision 1.4  2002/03/26 16:24:49  pierre

+ 5 - 2
packages/base/ibase/ibase40.pp

@@ -6,7 +6,7 @@ unit ibase40;
 interface
 
 const
-  {$ifdef linux}
+  {$ifdef Unix}
   LibName = 'gds';
   {$linklib c}
   {$else}
@@ -1847,7 +1847,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.1  2002-01-29 17:54:50  peter
+  Revision 1.2  2002-05-31 11:54:32  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.1  2002/01/29 17:54:50  peter
     * splitted to base and extra
 
   Revision 1.3  2001/04/10 23:30:03  peter

+ 5 - 2
packages/base/mysql/testdb.pp

@@ -32,7 +32,7 @@ begin
     end;
   Writeln ('Done.');
   Writeln ('Connection data:');
-{$ifdef linux}  
+{$ifdef Unix}  
   writeln ('Mysql_port      : ',mysql_port);
   writeln ('Mysql_unix_port : ',mysql_unix_port);
 {$endif}  
@@ -82,7 +82,10 @@ begin
   halt(0);
 end.
   $Log$
-  Revision 1.1  2002-01-29 17:54:54  peter
+  Revision 1.2  2002-05-31 11:54:33  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.1  2002/01/29 17:54:54  peter
     * splitted to base and extra
 
   Revision 1.2  2000/07/13 11:33:26  michael

+ 1 - 1
packages/extra/gtk/examples/paned.pp

@@ -13,7 +13,7 @@
   {$define extdecl := stdcall;}
   {$APPTYPE GUI}
 {$endif}
-{$ifdef linux}
+{$ifdef unix}
   {$define extdecl := cdecl;}
 {$endif}
 Program panned;

+ 1 - 1
packages/extra/gtk/examples/rulers.pp

@@ -14,7 +14,7 @@
   {$define extdecl := stdcall;}
   {$APPTYPE GUI}
 {$endif}
-{$ifdef linux}
+{$ifdef unix}
   {$define extdecl := cdecl;}
 {$endif}
 

+ 1 - 1
packages/extra/gtk/examples/spinbutton.pp

@@ -13,7 +13,7 @@
   {$define extdecl := stdcall;}
   {$APPTYPE GUI}
 {$endif}
-{$ifdef linux}
+{$ifdef unix}
   {$define extdecl := cdecl;}
 {$endif}
 

+ 1 - 1
packages/extra/gtk/examples/statusbar.pp

@@ -13,7 +13,7 @@
   {$define extdecl := stdcall;}
   {$APPTYPE GUI}
 {$endif}
-{$ifdef linux}
+{$ifdef unix}
   {$define extdecl := cdecl;}
 {$endif}
 

+ 1 - 1
packages/extra/gtk/examples/toolbar.pp

@@ -13,7 +13,7 @@
   {$define extdecl := stdcall;}
   {$APPTYPE GUI}
 {$endif}
-{$ifdef linux}
+{$ifdef Unix}
   {$define extdecl := cdecl;}
 {$endif}
 

+ 5 - 11
packages/extra/ncurses/ncrt.pp

@@ -25,21 +25,12 @@ Unit nCrt;
 Interface
 
 Uses
-{$ifdef freebsd}
+{$ifdef Unix}
   {$ifdef ver1_0}
     linux,
   {$else}
     unix,
   {$endif}
-{$endif}
-{$ifdef linux}
- {$ifndef freebsd}
-  {$ifdef ver1_0}
-    linux,
-  {$else}
-    unix,
-  {$endif}
- {$endif}
 {$endif}
   ncurses;
 
@@ -55,7 +46,10 @@ Begin
 End. { of Unit nCrt }
 {
   $Log$
-  Revision 1.1  2002-01-29 17:55:17  peter
+  Revision 1.2  2002-05-31 11:54:33  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.1  2002/01/29 17:55:17  peter
     * splitted to base and extra
 
   Revision 1.6  2001/04/19 12:40:56  marco

+ 7 - 10
packages/extra/uncgi/uncgi.pp

@@ -9,19 +9,13 @@ unit uncgi;
 interface
 uses
   strings
-{$ifdef ver1_0}
- {$ifdef FreeBSD}               {In 1.0 FreeBSD still defines Linux!}
+ {$ifdef Unix}
+  {$ifdef ver1_0}
     ,Linux
   {$else}
-  {$ifdef linux}
-    ,Linux
-  {$endif}
-  {$endif}
-{$else}
-  {$ifdef Unix}
     ,Unix
   {$endif}
-{$endif}
+ {$endif}
 {$IFDEF OS2}
   ,DosCalls
 {$ENDIF OS2}
@@ -460,7 +454,10 @@ end.
 {
   HISTORY
   $Log$
-  Revision 1.3  2002-03-04 17:57:17  peter
+  Revision 1.4  2002-05-31 11:54:33  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.3  2002/03/04 17:57:17  peter
     * updated example in comment
 
   Revision 1.2  2002/03/01 10:57:03  peter

+ 8 - 5
packages/extra/unzip/unzip.pp

@@ -11,7 +11,7 @@ Unzips deflated, imploded, shrunk and stored files
         * Delphi v2.x
         * Delphi v3.x
         * Virtual Pascal v2.0   (OS/2, Win32)
-        * Free Pascal Compiler  (DOS, OS/2, Win32, Linux)
+        * Free Pascal Compiler  (DOS, OS/2, Win32, Linux, FreeBSD, NetBSD)
 }
 
 {
@@ -2330,7 +2330,7 @@ FUNCTION unzipfile ( in_name : pchar;out_name : pchar;offset : longint;
 VAR err : integer;
     header : plocalheader;
     buf : ARRAY [ 0..80 ] of char;
-{$ifndef linux}
+{$ifndef unix}
     buf0 : ARRAY [ 0..3 ] of char;
 {$endif}
     storefilemode,
@@ -2451,7 +2451,7 @@ BEGIN
     p1 := strrscan ( buf, DirSep );
     IF p1 <> NIL THEN inc ( p1 );  {pointer to filename}
     p := strtok ( buf, DirSep );
-{$ifndef linux}
+{$ifndef unix}
     IF ( p <> NIL ) AND ( p [ 1 ] = ':' ) THEN BEGIN
       strcopy ( buf0, 'c:\' );    {set drive}
       buf0 [ 0 ] := p [ 0 ];
@@ -2689,7 +2689,7 @@ BEGIN
   buf^ [ offs ] := #0;  {Repair signature of next block!}
   strlcopy ( filename, pchar ( @buf^ [ localstart + sizeof ( header^ ) ] ), sizeof ( filename ) -1 );
   buf^ [ offs ] := old;
-{$ifndef linux}
+{$ifndef unix}
   REPEAT           {Convert slash to backslash!}
     p := strscan ( filename, '/' );
     IF p <> NIL THEN p [ 0 ] := '\';
@@ -3336,7 +3336,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.4  2002-03-19 13:03:43  pierre
+  Revision 1.5  2002-05-31 11:54:33  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.4  2002/03/19 13:03:43  pierre
    * fix the setftime for all targets
 
   Revision 1.3  2002/03/15 11:33:33  pierre

+ 6 - 3
packages/extra/unzip/ziptypes.pp

@@ -44,14 +44,14 @@ CONST
 {$IFDEF OS2}
   AllFiles = '*';
 {$ELSE}
-  {$ifdef linux}
+  {$ifdef unix}
   AllFiles = '*';
   {$else}
   AllFiles = '*.*';
   {$endif}
 {$ENDIF}
 
-{$ifdef linux}
+{$ifdef unix}
   DirSep='/';
 {$else}
   DirSep='\';
@@ -202,7 +202,10 @@ END;
 END.
 {
   $Log$
-  Revision 1.1  2002-01-29 17:55:23  peter
+  Revision 1.2  2002-05-31 11:54:33  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.1  2002/01/29 17:55:23  peter
     * splitted to base and extra
 
   Revision 1.1  2001/01/30 19:26:18  peter

+ 5 - 2
packages/extra/zlib/zlib.pp

@@ -8,7 +8,7 @@ interface
 { Needed for array of const }
 {$mode objfpc}
 { for linux for linking with libc }
-{$ifdef linux}
+{$ifdef unix}
   {$linklib c}
 {$endif}
 {$PACKRECORDS 4}
@@ -177,7 +177,10 @@ function zError(err:longint):string;
 end.
 {
   $Log$
-  Revision 1.1  2002-01-29 17:55:23  peter
+  Revision 1.2  2002-05-31 11:54:33  marco
+  * Renamefest for 1.0, many 1.1.x spots patched also.
+
+  Revision 1.1  2002/01/29 17:55:23  peter
     * splitted to base and extra
 
   Revision 1.2  2000/07/13 11:33:34  michael