[Emacs-diffs] /srv/bzr/emacs/trunk r99794: Clean up BSD_SYSTEM use.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99794
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-31 13:39:03 -0700
message:
  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.
modified:
  src/ChangeLog
  src/emacs.c
  src/process.c
  src/sysdep.c
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-31 14:55:01 +0000
+++ b/src/ChangeLog     2010-03-31 20:39:03 +0000
@@ -1,3 +1,13 @@
+2010-03-31  Dan Nicolaescu  <address@hidden>
+
+       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  <address@hidden>
 
        * image.c: Add `Qextension_data'.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-03-20 08:11:59 +0000
+++ b/src/emacs.c       2010-03-31 20:39:03 +0000
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef BSD_SYSTEM
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 

=== modified file 'src/process.c'
--- a/src/process.c     2010-03-27 00:45:32 +0000
+++ b/src/process.c     2010-03-31 20:39:03 +0000
@@ -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>

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2010-03-31 04:14:08 +0000
+++ b/src/sysdep.c      2010-03-31 20:39:03 +0000
@@ -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;
 }
 

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-02-24 18:23:48 +0000
+++ b/src/xterm.c       2010-03-31 20:39:03 +0000
@@ -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"