* src/process.c: Simplify include logic.

diff --git a/src/ChangeLog b/src/ChangeLog
index d93b26b3a41d7d204831c551f7b9062bcd08e2db..509ed3e7ea1acd93c94b9d12037bbcf334bb0635 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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:

diff --git a/src/process.c b/src/process.c
index 56d914ce6d5d700d944ade5356c1e9f843b8e9a5..36f5a7d5adb3612975e9009bc26123b4e9fe3c35 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -64,21 +64,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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