(C_SWITCH_SYSTEM, WAIT_USE_INT, SYS_SIGLIST_DECLARED)

(sys_siglist, NSIG): Definitions moved here from osf1.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f5c2fe21a118c62752314ec82f938e8a9a75cc8..a8685143a8c0631e3da577a63d640c59d292c733 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-27  Dave Love  <fx@gnu.org>
+
+       * s/osf1.h (C_SWITCH_SYSTEM, LIBS_SYSTEM): Revert last change
+       (moved to osf5-0.h).
+       [!NOT_C_CODE]: Protect string.h stuff.
+
+       * s/osf5-0.h (C_SWITCH_SYSTEM, WAIT_USE_INT, SYS_SIGLIST_DECLARED)
+       (sys_siglist, NSIG): Definitions moved here from osf1.h.
+
 2000-06-27  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (resize_mini_window): Subract the extra line spacing

diff --git a/src/s/osf5-0.h b/src/s/osf5-0.h
index 1bab7e8760b025f9067fd1870cac336d52fab4f8..3845fa76d029b8bf4fba212ad8f4ccba2a1cfdbc 100644 (file)
--- a/src/s/osf5-0.h
+++ b/src/s/osf5-0.h
@@ -1,4 +1,15 @@
 #define OSF5
 #include "osf1.h"
-/* We have missing/inconsistent prototypes, at least.  */
+
+/* The -BSD loses when _XOPEN_SOURCE gets defined by configure in
+   OSF 5.  It's possible this will need to be reverted for earlier
+   versions (for which OSF5 isn't defined).  */
+#undef C_SWITCH_SYSTEM
+#define C_SWITCH_SYSTEM        -D_OSF_SOURCE
+#define WAIT_USE_INT
+#define SYS_SIGLIST_DECLARED
+#define sys_siglist __sys_siglist
+#define NSIG __sys_nsig
+
+/* We have missing/inconsistent prototypes on 5.0, at least.  */
 #define INHIBIT_X11R6_XIM