From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 16 Jul 2008 05:25:53 +0000 (+0000)
Subject: STABLE14-softsig-structure-handling-20080716
X-Git-Tag: openafs-stable-1_4_8pre1~38
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7582371f287c074b87cc9cad1e68e18820aa3ad0;p=packages%2Fo%2Fopenafs.git

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 98c04cf49..c88ca20a7 100644
--- 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;