# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1270067943 25200
# Node ID 98f7a4103e8e75e2bcf8f62b123fa2dea4e84489
# Parent  9b2eadc063ccdbea1d8c20d0535686edf14d4a7a
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.

diff -r 9b2eadc063cc -r 98f7a4103e8e src/ChangeLog
--- a/src/ChangeLog	Wed Mar 31 18:16:12 2010 +0300
+++ b/src/ChangeLog	Wed Mar 31 13:39:03 2010 -0700
@@ -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 -r 9b2eadc063cc -r 98f7a4103e8e src/emacs.c
--- a/src/emacs.c	Wed Mar 31 18:16:12 2010 +0300
+++ b/src/emacs.c	Wed Mar 31 13:39:03 2010 -0700
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef BSD_SYSTEM
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
diff -r 9b2eadc063cc -r 98f7a4103e8e src/process.c
--- a/src/process.c	Wed Mar 31 18:16:12 2010 +0300
+++ b/src/process.c	Wed Mar 31 13:39:03 2010 -0700
@@ -69,12 +69,12 @@
 #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 -r 9b2eadc063cc -r 98f7a4103e8e src/sysdep.c
--- a/src/sysdep.c	Wed Mar 31 18:16:12 2010 +0300
+++ b/src/sysdep.c	Wed Mar 31 13:39:03 2010 -0700
@@ -384,11 +384,7 @@
 
 wait_without_blocking ()
 {
-#ifdef BSD_SYSTEM
-  wait3 (0, WNOHANG | WUNTRACED, 0);
-#else
   croak ("wait_without_blocking");
-#endif
   synch_process_alive = 0;
 }
 
diff -r 9b2eadc063cc -r 98f7a4103e8e src/xterm.c
--- a/src/xterm.c	Wed Mar 31 18:16:12 2010 +0300
+++ b/src/xterm.c	Wed Mar 31 13:39:03 2010 -0700
@@ -50,9 +50,9 @@
 #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"