* 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 74a4c894207200567b34a28b47d134e90cbe5d20..9b851c6d3541b9a44f4192d8468c5a74ef73eedb 100644 (file)
--- 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 deb96cabf1545f216aadf302fedba361deedf97c..01a71974b1c37266d2542e0801cda8e063e22666 100644 (file)
--- 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;