Move compat definition of NSIG to compat.h

--HG--
branch : 1.7

diff --git a/compat.h b/compat.h
index dc1a2aea001885d07e0fae6194e55569f1429f10..a5778548009af700bc2f2f4d8e18f2c611a82d71 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -295,6 +295,17 @@ const char *getprogname __P((void));
     } while (0)
 #endif
 
+/* Not all systems define NSIG in signal.h */
+#if !defined(NSIG)
+# if defined(_NSIG)
+#  define NSIG _NSIG
+# elif defined(__NSIG)
+#  define NSIG __NSIG
+# else
+#  define NSIG 64
+# endif
+#endif
+
 #ifndef WCOREDUMP
 # define WCOREDUMP(x)  ((x) & 0x80)
 #endif

diff --git a/exec.c b/exec.c
index c8a38546ef5958e7ce8d2814a72613b53fe17e89..4cb521892fd515617c9d14ba57e03956031f32a2 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -63,17 +63,6 @@
 # include <selinux/selinux.h>
 #endif
 
-/* XXX - move to compat */
-#if !defined(NSIG)
-# if defined(_NSIG)
-#  define NSIG _NSIG
-# elif defined(__NSIG)
-#  define NSIG __NSIG
-# else
-#  define NSIG 64
-# endif
-#endif
-
 #include "sudo.h"
 
 /* shared with exec_pty.c */

diff --git a/exec_pty.c b/exec_pty.c
index 12ae533a110643a95158754210784e9c234390a4..ccea5dc3fafca297f44e788a1f38baa08c148dd8 100644 (file)
--- a/exec_pty.c
+++ b/exec_pty.c
@@ -59,17 +59,6 @@
 #include <fcntl.h>
 #include <signal.h>
 
-/* XXX - move to compat.h */
-#if !defined(NSIG)
-# if defined(_NSIG)
-#  define NSIG _NSIG
-# elif defined(__NSIG)
-#  define NSIG __NSIG
-# else
-#  define NSIG 64
-# endif
-#endif
-
 #include "sudo.h"
 
 #define SFD_STDIN      0

diff --git a/mksiglist.c b/mksiglist.c
index e703aff784936a0f9593012c09b6d6669c0fed19..09b141419a8bd2ae0d98d9dbc316565e05cec00a 100644 (file)
--- a/mksiglist.c
+++ b/mksiglist.c
@@ -30,16 +30,6 @@
 
 #include <compat.h>
 
-#if !defined(NSIG)
-# if defined(_NSIG)
-#  define NSIG _NSIG
-# elif defined(__NSIG)
-#  define NSIG __NSIG
-# else
-#  error one of NSIG, _NSIG, or __NSIG must be defined
-# endif
-#endif
-
 int
 main(argc, argv)
     int argc;

diff --git a/strsignal.c b/strsignal.c
index f243015dad15d1cee4cb07615be143b8615ea4a7..cead4ada194bad133487a0c64bea5bb4e15f4418 100644 (file)
--- a/strsignal.c
+++ b/strsignal.c
@@ -20,16 +20,6 @@
 #include <config.h>
 #include <compat.h>
 
-#if !defined(NSIG)
-# if defined(_NSIG)
-#  define NSIG _NSIG
-# elif defined(__NSIG)
-#  define NSIG __NSIG
-# else
-#  error one of NSIG, _NSIG, or __NSIG must be defined
-# endif
-#endif
-
 #if defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST == 1
 # define my_sys_siglist        sys_siglist
 #elif defined(HAVE_DECL__SYS_SIGLIST) && HAVE_DECL__SYS_SIGLIST == 1

diff --git a/tgetpass.c b/tgetpass.c
index ed7e43561c2d3f75af7b83f741121578d25ff527..1ab6f1cae09e88ed04d371da4aff8af861abb643 100644 (file)
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -56,16 +56,6 @@
 
 #include "sudo.h"
 
-#if !defined(NSIG)
-# if defined(_NSIG)
-#  define NSIG _NSIG
-# elif defined(__NSIG)
-#  define NSIG __NSIG
-# else
-#  define NSIG 64
-# endif
-#endif
-
 static volatile sig_atomic_t signo[NSIG];
 
 static void handler __P((int));