(NSIG): Don't redefine.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9fa435c8d9e985df4e69e3072d76d454cd18d00b..4076f9542167e39b302ec0f38f2babdbac7cd301 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-20  Dave Love  <fx@gnu.org>
+
+       * s/osf5-0.h (NSIG): Don't redefine.
+
 2000-12-20  Stefan Monnier  <monnier@cs.yale.edu>
 
        * keymap.c (where_is_internal): Check ascii_sequence_p rather than

diff --git a/src/s/osf5-0.h b/src/s/osf5-0.h
index 1e490c5a99832a72f44ba0b62da5da6baa17e136..b084ab8c887ffcade46509996606703b7bbc5420 100644 (file)
--- a/src/s/osf5-0.h
+++ b/src/s/osf5-0.h
@@ -8,7 +8,9 @@
 #define WAIT_USE_INT
 #define SYS_SIGLIST_DECLARED
 #define sys_siglist __sys_siglist
+#ifndef NSIG                   /* _OSF_SOURCE seems to get us this */
 #define NSIG __sys_nsig
+#endif
 
 /* We have missing/inconsistent prototypes on 5.0, at least.  */
 #define INHIBIT_X11R6_XIM