diff options
Diffstat (limited to 'parallel/glunix/patches/patch-ah')
| -rw-r--r-- | parallel/glunix/patches/patch-ah | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/parallel/glunix/patches/patch-ah b/parallel/glunix/patches/patch-ah index 965ec6456de..b3b0bbf1a31 100644 --- a/parallel/glunix/patches/patch-ah +++ b/parallel/glunix/patches/patch-ah @@ -1,14 +1,20 @@ -$NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +$NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $ ---- glunix/src/signal/csignal.cc.orig Thu Oct 24 15:40:47 1996 -+++ glunix/src/signal/csignal.cc Fri Mar 13 04:53:45 1998 -@@ -113,2 +113,5 @@ +--- glunix/src/signal/csignal.cc.orig Fri Oct 25 00:40:47 1996 ++++ glunix/src/signal/csignal.cc Fri May 26 15:17:55 2000 +@@ -111,6 +111,9 @@ + #ifdef __svr4__ + #define MAX_SIGNAL 35 #endif +#ifdef __NetBSD__ +#define MAX_SIGNAL NSIG +#endif -@@ -218,8 +221,14 @@ + #define SIGNAL_MAX_HANDLERS 5 + +@@ -216,12 +219,18 @@ + sigaddset(&allSignals, SIGTERM); + sigaddset(&allSignals, SIGUSR1); sigaddset(&allSignals, SIGUSR2); +#ifndef __NetBSD__ sigaddset(&allSignals, SIGCLD); @@ -23,14 +29,31 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ sigaddset(&allSignals, SIGPOLL); +#endif sigaddset(&allSignals, SIGIO); -@@ -234,4 +243,5 @@ + sigaddset(&allSignals, SIGSTOP); + sigaddset(&allSignals, SIGTSTP); +@@ -232,8 +241,9 @@ + sigaddset(&allSignals, SIGPROF); + sigaddset(&allSignals, SIGXCPU); sigaddset(&allSignals, SIGXFSZ); +#ifndef __NetBSD__ sigaddset(&allSignals, SIGWAITING); - +#endif initialized = True; -@@ -440,3 +450,7 @@ + cleanedUp = False; + +@@ -243,7 +253,7 @@ + NULL /* callback function */, 0 /* callback arg */)); + + #ifdef DEBUG +- debug_cleanupCallbacks->Add((void (*)(int, void *))Signal_Cleanup, NULL); ++ debug_cleanupCallbacks->Add((void (*)(int, void *))Signal_Cleanup, 0); + #endif + + return True; +@@ -438,7 +448,11 @@ + } else { + if (found) { // Otherwise, we're not catching it and we should be +#ifdef __NetBSD__ + signal(sig, CatchSignal); @@ -38,7 +61,11 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ sigset(sig, CatchSignal); +#endif } -@@ -865,7 +879,14 @@ + } + return; +@@ -863,11 +877,18 @@ + Bool + Signal_Hold(int sig) { - if (sighold(sig) < 0) { - return False; @@ -47,7 +74,7 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ - } +#ifdef __NetBSD__ +int i; -+ i = sigsetmask(NULL); ++ i = sigsetmask(0); + i &= ~sigmask(sig); + if (sigsetmask(i) < 0) { +#else @@ -58,7 +85,11 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ + return True; + } } -@@ -887,3 +908,7 @@ + + /****************************************************************************** +@@ -885,7 +906,11 @@ + Bool + Signal_Release(int sig) { +#ifdef __NetBSD__ + if (sigsetmask(sigmask(sig)) < 0 ) { @@ -66,3 +97,5 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ if (sigrelse(sig) < 0) { +#endif return False; + } else { + return True; |