From 1d29df5994318178a5505946ec1c4c3c06a25c93 Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 31 Mar 2010 13:39:03 -0700
Subject: [PATCH] Clean up BSD_SYSTEM use. * xterm.c: * process.c: * emacs.c:
 Use HAVE_SYS_IOCTL_H instead of BSD_SYSTEM as a guard for including
 <sys/ioctl.h>. * sysdep.c (wait_without_blocking): Remove BSD_SYSTEM case,
 this code is only used for MSDOS.

---
 src/ChangeLog | 10 ++++++++++
 src/emacs.c   |  2 +-
 src/process.c |  4 ++--
 src/sysdep.c  |  4 ----
 src/xterm.c   |  4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index e223ae0f696..8c83866350d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Clean up BSD_SYSTEM use.
+	* xterm.c:
+	* process.c:
+	* emacs.c: Use HAVE_SYS_IOCTL_H instead of BSD_SYSTEM as a guard
+	for including <sys/ioctl.h>.
+	* sysdep.c (wait_without_blocking): Remove BSD_SYSTEM case, this
+	code is only used for MSDOS.
+
 2010-03-31  Juri Linkov  <juri@jurta.org>
 
 	* image.c: Add `Qextension_data'.
diff --git a/src/emacs.c b/src/emacs.c
index 60aa14e2b78..6327fd8a7d3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -32,7 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #endif
 
-#ifdef BSD_SYSTEM
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
diff --git a/src/process.c b/src/process.c
index 4f103752296..43fa78c7bd4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -69,12 +69,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif /* HAVE_SOCKETS */
 
-#if defined(BSD_SYSTEM)
+#if defined(HAVE_SYS_IOCTL_H)
 #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_SYSTEM */
+#endif /* HAVE_SYS_IOCTL_H */
 
 #ifdef NEED_BSDTTY
 #include <bsdtty.h>
diff --git a/src/sysdep.c b/src/sysdep.c
index 73209b03c08..e23f52d92e5 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -384,11 +384,7 @@ set_exclusive_use (fd)
 
 wait_without_blocking ()
 {
-#ifdef BSD_SYSTEM
-  wait3 (0, WNOHANG | WUNTRACED, 0);
-#else
   croak ("wait_without_blocking");
-#endif
   synch_process_alive = 0;
 }
 
diff --git a/src/xterm.c b/src/xterm.c
index fd09d6d4815..1114fcccc53 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -50,9 +50,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>
 #endif /* makedev */
 
-#ifdef BSD_SYSTEM
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#endif /* ! defined (BSD_SYSTEM) */
+#endif /* ! defined (HAVE_SYS_IOCTL_H) */
 
 #include "systime.h"
 
-- 
2.39.5