Mercurial > emacs
changeset 107722:98f7a4103e8e
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 31 Mar 2010 13:39:03 -0700 |
| parents | 9b2eadc063cc |
| children | d6963128f839 d3652b82ebe3 |
| files | src/ChangeLog src/emacs.c src/process.c src/sysdep.c src/xterm.c |
| diffstat | 5 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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'.
--- 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
--- 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>
--- 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; }
--- 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"