[Emacs-diffs] /srv/bzr/emacs/trunk r102587: * src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).

[Chong Yidong]

------------------------------------------------------------
revno: 102587
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-12-04 20:23:22 -0500
message:
  * src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).
modified:
  src/ChangeLog
  src/process.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-04 19:50:39 +0000
+++ b/src/ChangeLog     2010-12-05 01:23:22 +0000
@@ -1,3 +1,7 @@
+2010-12-05  Chong Yidong  <address@hidden>
+
+       * process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).
+
 2010-12-04  Andreas Schwab  <address@hidden>
 
        * Makefile.in (M_FILE): Substitute @M_FILE@ instead of @address@hidden

=== modified file 'src/process.c'
--- a/src/process.c     2010-11-18 16:57:00 +0000
+++ b/src/process.c     2010-12-05 01:23:22 +0000
@@ -3807,7 +3807,7 @@
 }
 
 
-#if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H)
+#if defined(HAVE_NET_IF_H)
 
 #ifdef SIOCGIFCONF
 DEFUN ("network-interface-list", Fnetwork_interface_list, 
Snetwork_interface_list, 0, 0, 0,
@@ -4050,7 +4050,7 @@
   return any ? res : Qnil;
 }
 #endif
-#endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */
+#endif /* defined(HAVE_NET_IF_H) */
 
 /* Turn off input and output for process PROC.  */
 
@@ -7704,14 +7704,14 @@
   defsubr (&Sset_network_process_option);
   defsubr (&Smake_network_process);
   defsubr (&Sformat_network_address);
-#if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H)
+#if defined(HAVE_NET_IF_H)
 #ifdef SIOCGIFCONF
   defsubr (&Snetwork_interface_list);
 #endif
 #if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
   defsubr (&Snetwork_interface_info);
 #endif
-#endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */
+#endif /* defined(HAVE_NET_IF_H) */
 #ifdef DATAGRAM_SOCKETS
   defsubr (&Sprocess_datagram_address);
   defsubr (&Sset_process_datagram_address);