STABLE14-softsig-structure-handling-20080716

LICENSE IPL10

this is sort of a dumb ifdef. harmless, but fix it to be what it's supposed to

(cherry picked from commit 4d7cfa129353001759c6224cc5c590be7e043fe9)

diff --git a/src/util/softsig.c b/src/util/softsig.c
index 98c04cf4928a9a90a40790ed50471f92a844cd58..c88ca20a7e05458312e7416eb771773e2710ded3 100644 (file)
--- a/src/util/softsig.c
+++ b/src/util/softsig.c
@@ -37,7 +37,7 @@ static pthread_t softsig_tid;
 static struct {
     void (*handler) (int);
     int pending;
-#if !defined(AFS_DARWIN60_ENV) || defined(AFS_NBSD30_ENV) || !defined(AFS_NBSD_ENV)
+#if !(defined(AFS_DARWIN60_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD30_ENV)))
     int fatal;
 #endif /* !defined(AFS_DARWIN60_ENV) || !defined(AFS_NBSD_ENV) */
     int inited;