diff options
| author | Chong Yidong | 2010-12-04 20:23:22 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-12-04 20:23:22 -0500 |
| commit | d23d86081b976717a19d93ff92e37f72619b9545 (patch) | |
| tree | 5e3571be520ff8769e2e59bf00fb80f740745db9 /src/process.c | |
| parent | ac73d955823410273066d923287f341cb6fa8a44 (diff) | |
| download | emacs-d23d86081b976717a19d93ff92e37f72619b9545.tar.gz emacs-d23d86081b976717a19d93ff92e37f72619b9545.zip | |
* src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484).
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/process.c b/src/process.c index f8ca0958dd1..6ffcc5b8099 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -3807,7 +3807,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3807 | } | 3807 | } |
| 3808 | 3808 | ||
| 3809 | 3809 | ||
| 3810 | #if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) | 3810 | #if defined(HAVE_NET_IF_H) |
| 3811 | 3811 | ||
| 3812 | #ifdef SIOCGIFCONF | 3812 | #ifdef SIOCGIFCONF |
| 3813 | DEFUN ("network-interface-list", Fnetwork_interface_list, Snetwork_interface_list, 0, 0, 0, | 3813 | 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. */) | |||
| 4050 | return any ? res : Qnil; | 4050 | return any ? res : Qnil; |
| 4051 | } | 4051 | } |
| 4052 | #endif | 4052 | #endif |
| 4053 | #endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */ | 4053 | #endif /* defined(HAVE_NET_IF_H) */ |
| 4054 | 4054 | ||
| 4055 | /* Turn off input and output for process PROC. */ | 4055 | /* Turn off input and output for process PROC. */ |
| 4056 | 4056 | ||
| @@ -7704,14 +7704,14 @@ The variable takes effect when `start-process' is called. */); | |||
| 7704 | defsubr (&Sset_network_process_option); | 7704 | defsubr (&Sset_network_process_option); |
| 7705 | defsubr (&Smake_network_process); | 7705 | defsubr (&Smake_network_process); |
| 7706 | defsubr (&Sformat_network_address); | 7706 | defsubr (&Sformat_network_address); |
| 7707 | #if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) | 7707 | #if defined(HAVE_NET_IF_H) |
| 7708 | #ifdef SIOCGIFCONF | 7708 | #ifdef SIOCGIFCONF |
| 7709 | defsubr (&Snetwork_interface_list); | 7709 | defsubr (&Snetwork_interface_list); |
| 7710 | #endif | 7710 | #endif |
| 7711 | #if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS) | 7711 | #if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS) |
| 7712 | defsubr (&Snetwork_interface_info); | 7712 | defsubr (&Snetwork_interface_info); |
| 7713 | #endif | 7713 | #endif |
| 7714 | #endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */ | 7714 | #endif /* defined(HAVE_NET_IF_H) */ |
| 7715 | #ifdef DATAGRAM_SOCKETS | 7715 | #ifdef DATAGRAM_SOCKETS |
| 7716 | defsubr (&Sprocess_datagram_address); | 7716 | defsubr (&Sprocess_datagram_address); |
| 7717 | defsubr (&Sset_process_datagram_address); | 7717 | defsubr (&Sset_process_datagram_address); |