From f0e1af4627caf44e4f57147c8901991c79b65ea1 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 14 Nov 2010 22:27:41 -0800 Subject: * src/process.c: Include unconditionally, keyboard.c already does it. --- src/process.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/process.c') diff --git a/src/process.c b/src/process.c index e1515065957..c38b94a9cb1 100644 --- a/src/process.c +++ b/src/process.c @@ -56,12 +56,10 @@ along with GNU Emacs. If not, see . */ #endif #endif -#if defined(HAVE_SYS_IOCTL_H) #include #if defined(HAVE_NET_IF_H) #include #endif /* HAVE_NET_IF_H */ -#endif /* HAVE_SYS_IOCTL_H */ #ifdef NEED_BSDTTY #include -- cgit v1.2.1 From 50c7742814aafd5a540f521d9662648ea2ac8f54 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 18 Nov 2010 08:57:00 -0800 Subject: Move declarations from .c files to .h files. * src/process.c (timers_run): * src/minibuf.c (quit_char): * src/lread.c (read_emacs_mule_char): * src/keyboard.c (minibuf_level, message_enable_multibyte) (pending_malloc_warning): * src/insdel.c (Vselect_active_regions, Vsaved_region_selection) (Qonly): Remove declarations. * src/lisp.h (pending_malloc_warning, Vsaved_region_selection) (Vselect_active_regions): * src/keyboard.h (timers_run): Add declarations. --- src/process.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/process.c') diff --git a/src/process.c b/src/process.c index c38b94a9cb1..f8ca0958dd1 100644 --- a/src/process.c +++ b/src/process.c @@ -113,8 +113,6 @@ along with GNU Emacs. If not, see . */ #include "nsterm.h" #endif -extern int timers_run; - Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; @@ -7744,5 +7742,3 @@ The variable takes effect when `start-process' is called. */); defsubr (&Sprocess_attributes); } -/* arch-tag: 3706c011-7b9a-4117-bd4f-59e7f701a4c4 - (do not change this comment) */ -- cgit v1.2.1 From d23d86081b976717a19d93ff92e37f72619b9545 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 4 Dec 2010 20:23:22 -0500 Subject: * src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484). --- src/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/process.c') 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) */) } -#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); -- cgit v1.2.1