From df1415c1bd01432e3c58fa2b58c22e7d1523fd33 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 23 Feb 2006 12:33:39 +0000 Subject: [PATCH] STABLE14-softsig-thread-hack-not-on-nbsd30-20060223 based on comment from gendalia@iastate.edu (cherry picked from commit d3113a14e81c02993749b8f3bf0421809793f46d) --- src/util/softsig.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/softsig.c b/src/util/softsig.c index 73e2e6f96..ac7ae1cc6 100644 --- a/src/util/softsig.c +++ b/src/util/softsig.c @@ -36,7 +36,7 @@ static pthread_t softsig_tid; static struct { void (*handler) (int); int pending; -#if !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV) +#if !defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD30_ENV) || !defined(AFS_NBSD_ENV) int fatal; #endif /* !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV) */ int inited; @@ -53,7 +53,7 @@ softsig_thread(void *arg) pthread_sigmask(SIG_BLOCK, &ss, &os); pthread_sigmask(SIG_SETMASK, &os, NULL); sigaddset(&ss, SIGUSR1); -#if defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) +#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD30_ENV)) pthread_sigmask (SIG_BLOCK, &ss, NULL); sigdelset (&os, SIGUSR1); #else /* !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) */ @@ -74,7 +74,7 @@ softsig_thread(void *arg) for (i = 0; i < NSIG; i++) { if (softsig_sigs[i].handler && !softsig_sigs[i].inited) { sigaddset(&ss, i); -#if defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) +#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD30_ENV)) pthread_sigmask (SIG_BLOCK, &ss, NULL); sigdelset (&os, i); #endif /* defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) */ @@ -87,7 +87,7 @@ softsig_thread(void *arg) } } if (i == NSIG) { -#if defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD_ENV) +#if defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD30_ENV)) sigsuspend (&os); #else /* !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV) */ sigwait(&ss, &sigw); -- 2.39.5