# HG changeset patch # User Chong Yidong # Date 1291512202 18000 # Node ID a60f0af8cb39a02d4c1c715a1d2b0f0a93b0e360 # Parent c54faf0302eae8c200c5de9f245034c71b927730 * src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484). diff -r c54faf0302ea -r a60f0af8cb39 src/ChangeLog --- a/src/ChangeLog Sat Dec 04 20:01:23 2010 -0500 +++ b/src/ChangeLog Sat Dec 04 20:23:22 2010 -0500 @@ -1,3 +1,7 @@ +2010-12-05 Chong Yidong + + * process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484). + 2010-12-04 Andreas Schwab * Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@. diff -r c54faf0302ea -r a60f0af8cb39 src/process.c --- a/src/process.c Sat Dec 04 20:01:23 2010 -0500 +++ b/src/process.c Sat Dec 04 20:23:22 2010 -0500 @@ -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);