Replaced symbol BSD with BSD_SYSTEM.

21 files changed, 49 insertions, 48 deletions

diff --git a/src/floatfns.c b/src/floatfns.c
index 37144a5eb18..87eb1f129aa 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -885,7 +885,7 @@ float_error (signo)
   if (! in_float)
     fatal_error_signal (signo);
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #ifdef BSD4_1
   sigrelse (SIGILL);
 #else /* not BSD4_1 */
@@ -894,7 +894,7 @@ float_error (signo)
 #else
   /* Must reestablish handler each time it is called.  */
   signal (SIGILL, float_error);
-#endif /* BSD */
+#endif /* BSD_SYSTEM */
 
   in_float = 0;
 
diff --git a/src/keyboard.c b/src/keyboard.c
index c6dbd5fcc94..da9d29609cb 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7321,7 +7321,7 @@ stuff_buffered_input (stuffstring)
      Lisp_Object stuffstring;
 {
 /* stuff_char works only in BSD, versions 4.2 and up.  */
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #ifndef BSD4_1
   register unsigned char *p;
 
@@ -7351,7 +7351,7 @@ stuff_buffered_input (stuffstring)
     }
   input_pending = 0;
 #endif
-#endif /* BSD and not BSD4_1 */
+#endif /* BSD_SYSTEM and not BSD4_1 */
 }
 
 set_waiting_for_input (time_to_clear)
diff --git a/src/m/intel386.h b/src/m/intel386.h
index b8e6591b64b..fd2aac37376 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -200,9 +200,9 @@ NOTE-END */
 #endif /* USG */
 #endif /* not XENIX */
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #define HAVE_ALLOCA
-#endif /* BSD */
+#endif /* BSD_SYSTEM */
 
 /* If compiling with GCC, let GCC implement alloca.  */
 #if defined(__GNUC__) && !defined(alloca)
diff --git a/src/m/mips.h b/src/m/mips.h
index 8c25c8733a3..00bca78eced 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -130,7 +130,7 @@ NOTE-END  */
 /* Alter some of the options used when linking.  */
 
 #ifndef NEWSOS5
-#ifdef BSD
+#ifdef BSD_SYSTEM
 
 /* DECstations don't have this library.
    #define LIBS_MACHINE -lmld  */
@@ -140,7 +140,7 @@ NOTE-END  */
 
 #define LINKER /bsd43/bin/ld
   
-#else /* not BSD */
+#else /* not BSD_SYSTEM */
 
 #if defined(__GNUC__) && defined(_ABIN32)
 #define LIBS_MACHINE
@@ -160,7 +160,7 @@ NOTE-END  */
 #define HAVE_VFORK		/* Graciously provided by libX.a */
 #endif
 
-#endif /* not BSD */
+#endif /* not BSD_SYSTEM */
 #endif /* not NEWSOS5 */
 
 /* The standard definitions of these macros would work ok,
@@ -214,11 +214,11 @@ NOTE-END  */
 
 #endif /* USG */
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #define COFF
 #define TERMINFO
 #undef MAIL_USE_FLOCK  /* Someone should check this.  */
 #undef HAVE_UNION_WAIT
-#endif /* BSD */
+#endif /* BSD_SYSTEM */
 
 #endif /* not NEWSOS5 */
diff --git a/src/m/mips4.h b/src/m/mips4.h
index 8590d6e71bc..33905072ac0 100644
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -50,8 +50,8 @@ NOTE-END  */
 #define NO_MODE_T
 
 /* These are needed on Riscos 4.0.
-   It appears that's the only system which uses mips4.h and defined BSD.  */
-#ifdef BSD
+   It appears that's the only system which uses mips4.h and defines BSD.  */
+#ifdef BSD_SYSTEM
 #undef HAVE_STRERROR
 #undef HAVE_XRMSETDATABASE
 #undef HAVE_XSCREENRESOURCESTRING
diff --git a/src/m/vax.h b/src/m/vax.h
index d651d74f37f..99d06d1c0d9 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -70,7 +70,7 @@ NOTE-END  */
 
 #define DOT_GLOBAL_START
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 /* USG systems I know of running on Vaxes do not actually
    support the load average, so disable it for them.  */
 
@@ -82,7 +82,7 @@ NOTE-END  */
 
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
 
-#endif /* BSD */
+#endif /* BSD_SYSTEM */
 
 #ifdef VMS
 
@@ -111,9 +111,9 @@ NOTE-END  */
 #define TEXT_START 0
 #endif /* USG */
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #define HAVE_ALLOCA
-#endif /* BSD */
+#endif /* BSD_SYSTEM */
 
 #ifdef VMS
 #define C_ALLOCA
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 5b8d9cc7f9c..333642f0c82 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -83,7 +83,7 @@ extern POINTER start_of_data ();
 #define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
 #endif
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #ifndef DATA_SEG_BITS
 extern char etext;
 #define start_of_data() &etext
diff --git a/src/process.c b/src/process.c
index b94b1d30969..8880b8c9ca4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -73,12 +73,12 @@ Boston, MA 02111-1307, USA.  */
 #define NUMERIC_ADDR_ERROR (numeric_addr == -1)
 #endif
 
-#if defined(BSD) || defined(STRIDE)
+#if defined(BSD_SYSTEM) || defined(STRIDE)
 #include <sys/ioctl.h>
 #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5)
 #include <fcntl.h>
 #endif /* HAVE_PTYS and no O_NDELAY */
-#endif /* BSD or STRIDE */
+#endif /* BSD_SYSTEM || STRIDE */
 
 #ifdef BROKEN_O_NONBLOCK
 #undef O_NONBLOCK
@@ -1334,7 +1334,7 @@ create_process (process, new_argv, current_dir)
 #ifdef BSD4_1
   sighold (SIGCHLD);
 #else /* not BSD4_1 */
-#if defined (BSD) || defined (UNIPLUS) || defined (HPUX)
+#if defined (BSD_SYSTEM) || defined (UNIPLUS) || defined (HPUX)
   sigsetmask (sigmask (SIGCHLD));
 #else /* ordinary USG */
 #if 0
@@ -1504,7 +1504,7 @@ create_process (process, new_argv, current_dir)
 #ifdef BSD4_1
 	sigrelse (SIGCHLD);
 #else /* not BSD4_1 */
-#if defined (BSD) || defined (UNIPLUS) || defined (HPUX)
+#if defined (BSD_SYSTEM) || defined (UNIPLUS) || defined (HPUX)
 	sigsetmask (SIGEMPTYMASK);
 #else /* ordinary USG */
 #if 0
@@ -1585,7 +1585,7 @@ create_process (process, new_argv, current_dir)
 #ifdef BSD4_1
   sigrelse (SIGCHLD);
 #else /* not BSD4_1 */
-#if defined (BSD) || defined (UNIPLUS) || defined (HPUX)
+#if defined (BSD_SYSTEM) || defined (UNIPLUS) || defined (HPUX)
   sigsetmask (SIGEMPTYMASK);
 #else /* ordinary USG */
 #if 0
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;
diff --git a/src/syssignal.h b/src/syssignal.h
index 3c7d1da3d1e..b7e646a2787 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -127,7 +127,7 @@ sigset_t sys_sigsetmask (/*sigset_t new_mask*/);
 
 /* On bsd, [man says] kill does not accept a negative number to kill a pgrp.
    Must do that using the killpg call.  */
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #define EMACS_KILLPG(gid, signo) (killpg ( (gid), (signo)))
 #else
 #ifdef WINDOWSNT
diff --git a/src/syswait.h b/src/syswait.h
index 7127b3966ce..1889c36a32e 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
 
 #else /* not WAIT_USE_INT */
 
-#if (!defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER))
+#if (!defined (BSD_SYSTEM) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER))
 #define WAITTYPE int
 #define WIFSTOPPED(w) ((w&0377) == 0177)
 #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0)
@@ -84,7 +84,7 @@ Boston, MA 02111-1307, USA.  */
 #ifndef WIFEXITED
 #define WIFEXITED(w) (WTERMSIG (w) == 0)
 #endif
-#endif /* BSD or UNIPLUS or STRIDE */
+#endif /* BSD_SYSTEM || UNIPLUS || STRIDE || HPUX */
 #endif /* not WAIT_USE_INT */
 #endif /* no WAITTYPE */
 
diff --git a/src/xterm.c b/src/xterm.c
index 2be321ef5f3..d1aa2d4e26e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -51,9 +51,9 @@ Boston, MA 02111-1307, USA.  */
 #endif /* makedev */
 #endif /* USG */
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
 #include <sys/ioctl.h>
-#endif /* ! defined (BSD) */
+#endif /* ! defined (BSD_SYSTEM) */
 
 #include "systty.h"
 #include "systime.h"