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 --git a/src/ChangeLog b/src/ChangeLog
index e223ae0f6965f58c909ffa12937d4ac7b73b975b..8c83866350da96c261298c64ed74b8a4745d99d4 100644 (file)
--- 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 60aa14e2b78b7d575aefe6099193cbaac10376be..6327fd8a7d33a50248bb014ee4f1b634963db281 100644 (file)
--- 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 4f10375229687cecdf26cd666e369a3377f13b0b..43fa78c7bd42725cee08fd6ffeae66c32a973563 100644 (file)
--- 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 73209b03c08ceda1a63e9734dfe864947e766d61..e23f52d92e5dda23318c3cf48f18f8ae8055be32 100644 (file)
--- 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 fd09d6d4815b6585cf3cdbbf4d5801d8dbc7f7f8..1114fcccc53a2b6afdcef9f601edf5c0598c8cb5 100644 (file)
--- 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"