From: Dave Love <fx@gnu.org>
Date: Tue, 27 Jun 2000 16:24:16 +0000 (+0000)
Subject: (C_SWITCH_SYSTEM, LIBS_SYSTEM): Revert last change (moved to osf5-0.h).
X-Git-Tag: emacs-pretest-21.0.90~3047
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a61f217b5bcd700d557eb080c91f93c0e6dae845;p=emacs.git

(C_SWITCH_SYSTEM, LIBS_SYSTEM): Revert last change (moved to osf5-0.h).
[!NOT_C_CODE]: Protect string.h stuff.
---

diff --git a/src/s/osf1.h b/src/s/osf1.h
index dd4fc372a64..38397e254e2 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -4,23 +4,9 @@
 
 #define OSF1
 
-/* The following used to be done, but -BSD loses when _XOPEN_SOURCE
-   gets defined by configure, at least on OSF5.  It's possible this
-   will need to be reverted for earlier versions (for which OSF5 isn't
-   defined).  */
-#if 0
 #define C_SWITCH_SYSTEM	-D_BSD
 #define LIBS_SYSTEM	-lbsd
 
-#else
-
-#define C_SWITCH_SYSTEM	-D_OSF_SOURCE
-#define WAIT_USE_INT
-#define SYS_SIGLIST_DECLARED
-#define sys_siglist __sys_siglist
-#define NSIG __sys_nsig
-#endif /* 0 */
-
 #define GETPGRP_NO_ARG
 
 #define SYSV_SYSTEM_DIR
@@ -42,6 +28,7 @@
 #define C_DEBUG_SWITCH -g3
 #endif
 
+#ifndef NOT_C_CODE
 #ifndef OSF5			/* fixed in 5.0 */
 /* Hack alert!  For reasons unknown to mankind the string.h file insists
    on defining bcopy etc. as taking char pointers as arguments.  With
@@ -56,3 +43,4 @@
 #undef bzero
 #undef bcmp
 #endif
+#endif