From e397a0172fe822eb80080184f5961a26916c9626 Mon Sep 17 00:00:00 2001
From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 17 Sep 1996 02:37:17 +0000
Subject: [PATCH] Replaced all BSD with BSD_SYSTEM.

---
 lib-src/emacsclient.c | 4 ++--
 lib-src/fakemail.c    | 2 +-
 lib-src/movemail.c    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index b74cc26d162..2e99e9d34ad 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -259,7 +259,7 @@ main (argc, argv)
       exit (1);
     }
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
   cwd = getwd (string);
 #else
   cwd = getcwd (string, sizeof string);
@@ -374,7 +374,7 @@ main (argc, argv)
     }
 
   /* Determine working dir, so we can prefix it to all the arguments.  */
-#ifdef BSD
+#ifdef BSD_SYSTEM
   temp = getwd (gwdirb);
 #else
   temp = getcwd (gwdirb, sizeof gwdirb);
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index d9af25d7dae..1deeec352b2 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SHORTNAMES
 #include <../src/config.h>
 
-#if defined (BSD) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
+#if defined (BSD_SYSTEM) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
 /* This program isnot used in BSD, so just avoid loader complaints.  */
 int
 main ()
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 3739e01371d..80f6afd3616 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -310,13 +310,13 @@ main (argc, argv)
       if (indesc < 0)
 	pfatal_with_name (inname);
 
-#if defined (BSD) || defined (XENIX)
+#if defined (BSD_SYSTEM) || defined (XENIX)
       /* In case movemail is setuid to root, make sure the user can
 	 read the output file.  */
       /* This is desirable for all systems
 	 but I don't want to assume all have the umask system call */
       umask (umask (0) & 0333);
-#endif /* BSD or Xenix */
+#endif /* BSD_SYSTEM || XENIX */
       outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
       if (outdesc < 0)
 	pfatal_with_name (outname);
@@ -354,7 +354,7 @@ main (argc, argv)
 	  }
       }
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
       if (fsync (outdesc) < 0)
 	pfatal_and_delete (outname);
 #endif
@@ -588,7 +588,7 @@ popmail (user, outfile, password)
    *      directories have lost mail when over quota because these checks were
    *      not made in previous versions of movemail. */
 
-#ifdef BSD
+#ifdef BSD_SYSTEM
   if (fsync (mbfi) < 0)
     {
       error ("Error in fsync: %s", strerror (errno));
-- 
2.39.2