From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 7 Aug 2000 10:49:24 +0000 (+0000)
Subject:         * ss_internal.h: Only use fake sigmask, sigblock and sigsetmask if
X-Git-Tag: krb5-1.3-alpha1~1935
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0e4f6e43d6e1bf1363f628826a76fefa3b989ff;p=krb5.git

    * ss_internal.h: Only use fake sigmask, sigblock and sigsetmask if
        USE_SIGPROCMASK is defined and not POSIX_SIGNALS.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12605 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 74a4c8942..9b851c6d3 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-07  Ezra Peisach  <epeisach@mit.edu>
+
+	* ss_internal.h: Only use fake sigmask, sigblock and sigsetmask if
+	USE_SIGPROCMASK is defined and not POSIX_SIGNALS.
+
 2000-08-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* listen.c (ss_quit): Now returns void.  Fix type of argument ARGV
diff --git a/src/util/ss/ss_internal.h b/src/util/ss/ss_internal.h
index deb96cabf..01a71974b 100644
--- a/src/util/ss/ss_internal.h
+++ b/src/util/ss/ss_internal.h
@@ -119,9 +119,12 @@ extern pointer realloc PROTOTYPE((pointer, unsigned));
 extern pointer calloc PROTOTYPE((unsigned, unsigned));
 #endif
 
-#ifdef USE_SIGPROCMASK
+#if defined(USE_SIGPROCMASK) && !defined(POSIX_SIGNALS)
 /* fake sigmask, sigblock, sigsetmask */
 #include <signal.h>
+#ifdef sigmask
+#undef sigmask
+#endif
 #define sigmask(x) (1L<<(x)-1)
 #define sigsetmask(x) sigprocmask(SIG_SETMASK,&x,NULL)
 static int _fake_sigstore;