[Emacs-diffs] /srv/bzr/emacs/trunk r101010: * src/process.c: Simplify include logic.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 101010
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-06 13:08:26 -0700
message:
  * src/process.c: Simplify include logic.
modified:
  src/ChangeLog
  src/process.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-06 19:52:47 +0000
+++ b/src/ChangeLog     2010-08-06 20:08:26 +0000
@@ -1,5 +1,7 @@
 2010-08-06  Dan Nicolaescu  <address@hidden>
 
+       * 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:

=== modified file 'src/process.c'
--- a/src/process.c     2010-08-06 19:07:16 +0000
+++ b/src/process.c     2010-08-06 20:08:26 +0000
@@ -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