summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog9
-rw-r--r--src/s/osf5-0.h13
2 files changed, 21 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0f5c2fe21a1..a8685143a8c 100644
--- 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 1bab7e8760b..3845fa76d02 100644
--- 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