* fixed bootstrap with 1.0.10 and 1.9.4

rtl/unix/bunxh.inc

@@ -22,11 +22,13 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
 // if you are looking for macro definitions or non C template overloaded versions, they are moved to bunxovlh.inc
 
 {$ifdef linux}
-    Function  FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt; 
-    Function  FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK'; 
+    Function  FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt;
+  {$ifndef VER1_0}
+    Function  FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
+  {$endif}
 {$else}
-    Function  FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK'; 
-    Function  FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK'; 
+    Function  FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
+    Function  FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
 {$endif}
     Function  FpSigPending (var nset : TSigSet): cInt;
     Function  FpSigSuspend (Const sigmask : TSigSet): cInt;
@@ -39,7 +41,7 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
     Function  FpUtime      (path : pChar; times : putimbuf): cInt;
     Function  FpPipe       (var fildes : tfildes):cInt;
     Function  FpDup        (fildes : cInt): cInt;  external name 'FPC_SYSC_DUP';
-    Function  FpDup2       (fildes, fildes2 : cInt): cInt; external name 'FPC_SYSC_DUP2'; 
+    Function  FpDup2       (fildes, fildes2 : cInt): cInt; external name 'FPC_SYSC_DUP2';
     Function  FpTimes      (var buffer : tms): TClock;
 
     Function  FpAlarm      (seconds : cuint): cuint;
@@ -63,7 +65,7 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
 
     Function  FpGetcwd     (path:pChar; siz:TSize):pChar;  external name 'FPC_SYSC_GETCWD';
     Function  FpFork : TPid; external name 'FPC_SYSC_FORK';
-    Function  FpExecve     (path : pChar; argv : ppChar; envp: ppChar): cInt; 
+    Function  FpExecve     (path : pChar; argv : ppChar; envp: ppChar): cInt;
     // external name 'FPC_SYSC_EXECVE';
     Function  FpExecv      (path : pChar; argv : ppChar): cInt;
     Function  FpWaitpid    (pid : TPid; stat_loc : pcInt; options: cInt): TPid; external name 'FPC_SYSC_WAITPID';
@@ -110,7 +112,10 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
 
 {
   $Log$
-  Revision 1.13  2004-11-19 13:15:14  marco
+  Revision 1.14  2004-11-21 11:28:21  peter
+    * fixed bootstrap with 1.0.10 and 1.9.4
+
+  Revision 1.13  2004/11/19 13:15:14  marco
    * external rework. Mostly done.
 
   Revision 1.12  2004/11/14 12:21:08  marco

rtl/unix/gpm.pp

@@ -19,7 +19,7 @@ unit gpm;
        Unfortunately it isn't suitable for anything else besides a blocky
        cursor on a text mode interface. The GPM protocol suffers from serious
        defficiencies and ideally, gpm is abolished as quickly as possible.
-       
+
        With lack of a good alternative, GPM deserves good support. But
        please keep this in mind while coding.}
 
@@ -88,7 +88,7 @@ type
           clicks : longint;
           margin : TGpmMargin;
      end;
-     
+
      Pgpmevent=Pgpm_event;
      Tgpmevent=Tgpm_event;
 
@@ -107,7 +107,7 @@ type
           pid : longint;
           vc : longint;
        end;
-     
+
      Pgpmconnect=Pgpm_connect;
      Tgpmconnect=Tgpm_connect;
 
@@ -214,7 +214,7 @@ type  Pgpm_stst=^Tgpm_stst;
         info:Tgpmconnect;
         next:Pgpm_stst;
       end;
-      
+
       Pmicetab=^Tmicetab;
       Tmicetab=record
         next:Pmicetab;
@@ -361,7 +361,7 @@ var conn:Tgpmconnect;
 begin
   fpsigemptyset(new_sigset);
   fpsigaddset(new_sigset,SIGTSTP);
-  fpsigprocmask(SIG_BLOCK,new_sigset,old_sigset);
+  fpsigprocmask(SIG_BLOCK,{$ifdef ver1_0}@{$endif}new_sigset,{$ifdef ver1_0}@{$endif}old_sigset);
 
   {Open a completely transparent gpm connection.}
   conn.eventmask:=0;
@@ -954,7 +954,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.13  2004-11-06 20:06:19  peter
+  Revision 1.14  2004-11-21 11:28:21  peter
+    * fixed bootstrap with 1.0.10 and 1.9.4
+
+  Revision 1.13  2004/11/06 20:06:19  peter
     * mouse works again
 
   Revision 1.12  2004/11/03 16:51:05  peter

rtl/unix/unix.pp

@@ -522,7 +522,7 @@ begin { Changes as above }
   fpsigaction(SIGQUIT, @ign, @quitact);
   fpsigemptyset(newsigblock);
   fpsigaddset(newsigblock,SIGCHLD);
-  fpsigprocmask(SIG_BLOCK,newsigblock,oldsigblock);
+  fpsigprocmask(SIG_BLOCK,{$ifdef ver1_0}@{$endif}newsigblock,{$ifdef ver1_0}@{$endif}oldsigblock);
   pid:=fpfork;
   if pid=0 then // We are in the Child
    begin
@@ -1254,7 +1254,10 @@ End.
 
 {
   $Log$
-  Revision 1.77  2004-11-19 13:15:15  marco
+  Revision 1.78  2004-11-21 11:28:21  peter
+    * fixed bootstrap with 1.0.10 and 1.9.4
+
+  Revision 1.77  2004/11/19 13:15:15  marco
    * external rework. Mostly done.
 
   Revision 1.76  2004/11/03 15:00:43  marco