Mercurial > emacs

diff src/process.c @ 109672:bd826f80a765

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/process.c: Simplify include logic.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 06 Aug 2010 13:08:26 -0700
parents d9a022ec322c
children 64732fa6188a
line wrap: on
line diff
--- 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