Replaced symbol BSD with BSD_SYSTEM.

10 files changed, 21 insertions, 20 deletions

diff --git a/src/s/bsd386.h b/src/s/bsd386.h
index 21ab7e0f0fe..c170c1efdca 100644
--- a/src/s/bsd386.h
+++ b/src/s/bsd386.h
@@ -34,7 +34,7 @@
 
 /* This silences a few compilation warnings.  */
 #ifdef emacs
-#undef BSD
+#undef BSD_SYSTEM
 #include <sys/param.h> /* To get BSD defined consistently.  */
 #endif
 
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index baaad1ee36e..9bca58f08b5 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define BSD4_1
 
-#define BSD
+#define BSD_SYSTEM
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index 3f38d594dfc..51ca3b77a9f 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -28,9 +28,9 @@ Boston, MA 02111-1307, USA.  */
 #define BSD4_2 1
 #endif /* BSD4_2 */
 
-#ifndef BSD
-#define BSD 42
-#endif /* BSD */
+#ifndef BSD_SYSTEM
+#define BSD_SYSTEM 42
+#endif /* BSD_SYSTEM */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index b221a667e1e..85671c37057 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -30,9 +30,9 @@ Boston, MA 02111-1307, USA.  */
 #define BSD4_3 1
 #endif /* BSD4_3 */
 
-#ifndef BSD
-#define BSD 43
-#endif /* BSD */
+#ifndef BSD_SYSTEM
+#define BSD_SYSTEM 43
+#endif /* BSD_SYSTEM */
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
diff --git a/src/s/cxux.h b/src/s/cxux.h
index bec58975b00..0281e789717 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
 /* #define BSD4_1 */
 /* #define BSD4_2 */
 /* #define BSD4_3 */
-/* #define BSD */
+/* #define BSD_SYSTEM */
 /* #define VMS */
 
 #ifndef	_CX_UX
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index ecfa869593f..9affb886231 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -75,11 +75,11 @@
 #define TAB3 OXTABS
 
 /* this silences a few compilation warnings */
-#undef BSD
+#undef BSD_SYSTEM
 #if __FreeBSD__ == 1
-#define BSD 199103
+#define BSD_SYSTEM 199103
 #elif __FreeBSD__ == 2
-#define BSD 199306
+#define BSD_SYSTEM 199306
 #endif
 
 #define WAITTYPE int
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 6f1d6f10792..8d4e70a91bf 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 /* #define BSD4_1 */
 /* #define BSD4_2 */
 /* #define BSD4_3 */
-/* #define BSD */
+/* #define BSD_SYSTEM */
 /* #define VMS */
 #ifndef MSDOS
 #define MSDOS
@@ -50,7 +50,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #endif
 
 #define DOS_NT	/* MSDOS or WINDOWSNT */
-#undef BSD
+#undef BSD_SYSTEM
 #undef VMS
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
diff --git a/src/s/rtu.h b/src/s/rtu.h
index 3e4aa0f24a9..45266f2716d 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
  */
 
 #define BSD4_2
-#define BSD
+#define BSD_SYSTEM
 #define RTU
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
diff --git a/src/s/umax.h b/src/s/umax.h
index 54ae8d5f0d1..de631f608c4 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
 /* #define BSD4_1 */
 #define BSD4_2
 /* #define BSD4_3 */
-#define BSD
+#define BSD_SYSTEM
 #define UMAX4_2
 #define UMAX
 /* #define VMS */
diff --git a/src/s/umips.h b/src/s/umips.h
index 608283eed61..07a4cd6bbb0 100644
--- a/src/s/umips.h
+++ b/src/s/umips.h
@@ -1,8 +1,9 @@
 /* Definitions file for GNU Emacs running on Mips operating system.
    That system can emulate either BSD or Sys V, in either case with changes.
-   If BSD is defined, we assume BSD is being emulated; otherwise, Sys V.  */
+   If BSD_SYSTEM is defined, we assume BSD is being emulated; otherwise,
+   Sys V.  */
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #include "bsd4-3.h"
 
 #define C_SWITCH_SYSTEM -systype bsd43
@@ -17,7 +18,7 @@
 #undef MAIL_USE_FLOCK  /* Someone should check this.  */
 #undef HAVE_UNION_WAIT
 
-#else /* not BSD */
+#else /* not BSD_SYSTEM */
 
 #include "usg5-2-2.h"
 
@@ -70,7 +71,7 @@
 /* ??? */
 #define IRIS
 
-#endif /* not BSD */
+#endif /* not BSD_SYSTEM */
 
 /* High order bit must be stripped off nlist return values */
 #define FIXUP_KERNEL_SYMBOL_ADDR(NL)  (NL)[0].n_value &= 0x7fffffff;