diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/process.c b/src/process.c index e1515065957..6ffcc5b8099 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -56,12 +56,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 56 | #endif | 56 | #endif |
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| 59 | #if defined(HAVE_SYS_IOCTL_H) | ||
| 60 | #include <sys/ioctl.h> | 59 | #include <sys/ioctl.h> |
| 61 | #if defined(HAVE_NET_IF_H) | 60 | #if defined(HAVE_NET_IF_H) |
| 62 | #include <net/if.h> | 61 | #include <net/if.h> |
| 63 | #endif /* HAVE_NET_IF_H */ | 62 | #endif /* HAVE_NET_IF_H */ |
| 64 | #endif /* HAVE_SYS_IOCTL_H */ | ||
| 65 | 63 | ||
| 66 | #ifdef NEED_BSDTTY | 64 | #ifdef NEED_BSDTTY |
| 67 | #include <bsdtty.h> | 65 | #include <bsdtty.h> |
| @@ -115,8 +113,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 115 | #include "nsterm.h" | 113 | #include "nsterm.h" |
| 116 | #endif | 114 | #endif |
| 117 | 115 | ||
| 118 | extern int timers_run; | ||
| 119 | |||
| 120 | Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; | 116 | Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; |
| 121 | Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; | 117 | Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; |
| 122 | Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; | 118 | Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; |
| @@ -3811,7 +3807,7 @@ usage: (make-network-process &rest ARGS) */) | |||
| 3811 | } | 3807 | } |
| 3812 | 3808 | ||
| 3813 | 3809 | ||
| 3814 | #if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) | 3810 | #if defined(HAVE_NET_IF_H) |
| 3815 | 3811 | ||
| 3816 | #ifdef SIOCGIFCONF | 3812 | #ifdef SIOCGIFCONF |
| 3817 | 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, |
| @@ -4054,7 +4050,7 @@ FLAGS is the current flags of the interface. */) | |||
| 4054 | return any ? res : Qnil; | 4050 | return any ? res : Qnil; |
| 4055 | } | 4051 | } |
| 4056 | #endif | 4052 | #endif |
| 4057 | #endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */ | 4053 | #endif /* defined(HAVE_NET_IF_H) */ |
| 4058 | 4054 | ||
| 4059 | /* Turn off input and output for process PROC. */ | 4055 | /* Turn off input and output for process PROC. */ |
| 4060 | 4056 | ||
| @@ -7708,14 +7704,14 @@ The variable takes effect when `start-process' is called. */); | |||
| 7708 | defsubr (&Sset_network_process_option); | 7704 | defsubr (&Sset_network_process_option); |
| 7709 | defsubr (&Smake_network_process); | 7705 | defsubr (&Smake_network_process); |
| 7710 | defsubr (&Sformat_network_address); | 7706 | defsubr (&Sformat_network_address); |
| 7711 | #if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) | 7707 | #if defined(HAVE_NET_IF_H) |
| 7712 | #ifdef SIOCGIFCONF | 7708 | #ifdef SIOCGIFCONF |
| 7713 | defsubr (&Snetwork_interface_list); | 7709 | defsubr (&Snetwork_interface_list); |
| 7714 | #endif | 7710 | #endif |
| 7715 | #if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS) | 7711 | #if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS) |
| 7716 | defsubr (&Snetwork_interface_info); | 7712 | defsubr (&Snetwork_interface_info); |
| 7717 | #endif | 7713 | #endif |
| 7718 | #endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */ | 7714 | #endif /* defined(HAVE_NET_IF_H) */ |
| 7719 | #ifdef DATAGRAM_SOCKETS | 7715 | #ifdef DATAGRAM_SOCKETS |
| 7720 | defsubr (&Sprocess_datagram_address); | 7716 | defsubr (&Sprocess_datagram_address); |
| 7721 | defsubr (&Sset_process_datagram_address); | 7717 | defsubr (&Sset_process_datagram_address); |
| @@ -7746,5 +7742,3 @@ The variable takes effect when `start-process' is called. */); | |||
| 7746 | defsubr (&Sprocess_attributes); | 7742 | defsubr (&Sprocess_attributes); |
| 7747 | } | 7743 | } |
| 7748 | 7744 | ||
| 7749 | /* arch-tag: 3706c011-7b9a-4117-bd4f-59e7f701a4c4 | ||
| 7750 | (do not change this comment) */ | ||