Mercurial > emacs
changeset 109672:bd826f80a765
* src/process.c: Simplify include logic.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 06 Aug 2010 13:08:26 -0700 |
| parents | f18fad7de4f5 |
| children | 0781924c2a38 |
| files | src/ChangeLog src/process.c |
| diffstat | 2 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 06 13:05:40 2010 -0700 +++ b/src/ChangeLog Fri Aug 06 13:08:26 2010 -0700 @@ -1,5 +1,7 @@ 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> + * process.c: Simplify include logic. + * keyboard.h (quit_char): Add declaration. * process.h (QCport, QCspeed, QCprocess, QCbytesize, QCstopbits) (QCparity, Qodd, Qeven, QCflowcontrol, Qhw, Qsw, QCsummary): Add @@ -10,7 +12,6 @@ Remove extern declarations in .c files, .h files have them. * xterm.c: * xdisp.c: - * process.c: * msdos.c: * image.c: * gtkutil.c:
--- a/src/process.c Fri Aug 06 13:05:40 2010 -0700 +++ b/src/process.c Fri Aug 06 13:08:26 2010 -0700 @@ -64,21 +64,15 @@ #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) #include <fcntl.h> #endif /* HAVE_PTYS and no O_NDELAY */ +#if defined(HAVE_NET_IF_H) +#include <net/if.h> +#endif /* HAVE_NET_IF_H */ #endif /* HAVE_SYS_IOCTL_H */ #ifdef NEED_BSDTTY #include <bsdtty.h> #endif -/* Can we use SIOCGIFCONF and/or SIOCGIFADDR */ -#if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H) -/* sys/ioctl.h may have been included already */ -#ifndef SIOCGIFADDR -#include <sys/ioctl.h> -#endif -#include <net/if.h> -#endif - #ifdef HAVE_SYS_WAIT #include <sys/wait.h> #endif