* fixed bootstrap with 1.0.10 and 1.9.4

This commit is contained in:
peter 2004-11-21 11:28:21 +00:00
parent 115bd8ae28
commit b7d7736352
3 changed files with 26 additions and 15 deletions

View File

@ -23,7 +23,9 @@ Type TGrpArr = Array [0..0] of TGid; { C style array workarounds}
{$ifdef linux} {$ifdef linux}
Function FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): cInt; 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'; Function FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
{$endif}
{$else} {$else}
Function FpSigProcMask(how : cInt; nset : pSigSet; oset : pSigSet): 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'; Function FpSigProcMask(how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
@ -110,7 +112,10 @@ Type TGrpArr = Array [0..0] of TGid; { C style array workarounds}
{ {
$Log$ $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. * external rework. Mostly done.
Revision 1.12 2004/11/14 12:21:08 marco Revision 1.12 2004/11/14 12:21:08 marco

View File

@ -361,7 +361,7 @@ var conn:Tgpmconnect;
begin begin
fpsigemptyset(new_sigset); fpsigemptyset(new_sigset);
fpsigaddset(new_sigset,SIGTSTP); 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.} {Open a completely transparent gpm connection.}
conn.eventmask:=0; conn.eventmask:=0;
@ -954,7 +954,10 @@ end;
end. end.
{ {
$Log$ $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 * mouse works again
Revision 1.12 2004/11/03 16:51:05 peter Revision 1.12 2004/11/03 16:51:05 peter

View File

@ -522,7 +522,7 @@ begin { Changes as above }
fpsigaction(SIGQUIT, @ign, @quitact); fpsigaction(SIGQUIT, @ign, @quitact);
fpsigemptyset(newsigblock); fpsigemptyset(newsigblock);
fpsigaddset(newsigblock,SIGCHLD); fpsigaddset(newsigblock,SIGCHLD);
fpsigprocmask(SIG_BLOCK,newsigblock,oldsigblock); fpsigprocmask(SIG_BLOCK,{$ifdef ver1_0}@{$endif}newsigblock,{$ifdef ver1_0}@{$endif}oldsigblock);
pid:=fpfork; pid:=fpfork;
if pid=0 then // We are in the Child if pid=0 then // We are in the Child
begin begin
@ -1254,7 +1254,10 @@ End.
{ {
$Log$ $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. * external rework. Mostly done.
Revision 1.76 2004/11/03 15:00:43 marco Revision 1.76 2004/11/03 15:00:43 marco