* src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).

diff --git a/src/ChangeLog b/src/ChangeLog
index 584a81cd88c6d92033f77cd43a6855b731b2698b..82614afb043f477031b6058f075dda00ef05aa23 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).
+
 2010-12-04  Andreas Schwab  <schwab@linux-m68k.org>
 
        * Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.

diff --git a/src/process.c b/src/process.c
index f8ca0958dd1456931dd242a8cbb504ccdb5f227d..6ffcc5b8099fb5e1599d400589b5c35b30217fec 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -3807,7 +3807,7 @@ usage: (make-network-process &rest ARGS)  */)
 }
 
 \f
-#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 @@ FLAGS is the current flags of the interface.  */)
   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 @@ The variable takes effect when `start-process' is called.  */);
   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);