From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 17 Sep 1996 02:56:22 +0000 (+0000)
Subject: Replace symbol BSD with BSD_SYSTEM.
X-Git-Tag: emacs-20.1~3725
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=488b7cb38fdeb47e67b0f6e8edd10e01cbc55595;p=emacs.git

Replace symbol BSD with BSD_SYSTEM.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index c34355dcdf2..57fa2f22c39 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -137,11 +137,11 @@ CC = C_COMPILER
 
 /* Some s/SYSTEM.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_SYSTEM
-#if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)))
+#if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)))
 #define LD_SWITCH_SYSTEM -X
-#else /* ! defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)) */
+#else /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */
 #define LD_SWITCH_SYSTEM
-#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)) */
+#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */
 #endif /* LD_SWITCH_SYSTEM */
 
 /* Some m/MACHINE.h files define this to request special switches in ld.  */
diff --git a/src/emacs.c b/src/emacs.c
index 5d7dd7202f0..4aa3f5d620d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include <ssdef.h>
 #endif
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #include <sys/ioctl.h>
 #endif