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.3 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/ChangeLog | 12 ++++++++++++ src/insdel.c | 5 ----- src/keyboard.c | 8 -------- src/keyboard.h | 4 ++-- src/lisp.h | 3 +++ src/lread.c | 2 -- src/minibuf.c | 4 ---- src/process.c | 4 ---- 8 files changed, 17 insertions(+), 25 deletions(-) (limited to 'src/process.c') diff --git a/src/ChangeLog b/src/ChangeLog index 8753246c92b..304176a40eb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,17 @@ 2010-11-18 Dan Nicolaescu + Move declarations from .c files to .h files. + * process.c (timers_run): + * minibuf.c (quit_char): + * lread.c (read_emacs_mule_char): + * keyboard.c (minibuf_level, message_enable_multibyte) + (pending_malloc_warning): + * insdel.c (Vselect_active_regions, Vsaved_region_selection) + (Qonly): Remove declarations. + * lisp.h (pending_malloc_warning, Vsaved_region_selection) + (Vselect_active_regions): + * keyboard.h (timers_run): Add declarations. + * strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) (tm_diff): Convert definitions to standard C. (extra_args_spec_iso): Remove, unused. diff --git a/src/insdel.c b/src/insdel.c index ff380ada192..b62889082fd 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -73,9 +73,6 @@ Lisp_Object combine_after_change_list; Lisp_Object combine_after_change_buffer; Lisp_Object Qinhibit_modification_hooks; - -extern Lisp_Object Vselect_active_regions, Vsaved_region_selection, Qonly; - /* Check all markers in the current buffer, looking for something invalid. */ @@ -2395,5 +2392,3 @@ as well as hooks attached to text properties and overlays. */); defsubr (&Scombine_after_change_execute); } -/* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d - (do not change this comment) */ diff --git a/src/keyboard.c b/src/keyboard.c index 0a6831750de..ec5c24511c4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -144,10 +144,6 @@ int this_single_command_key_start; static int before_command_key_count; static int before_command_echo_length; -extern int minbuf_level; - -extern int message_enable_multibyte; - /* If non-nil, the function that implements the display of help. It's called with one argument, the help string to display. */ @@ -431,8 +427,6 @@ FILE *dribble; /* Nonzero if input is available. */ int input_pending; -extern const char *pending_malloc_warning; - /* Circular buffer for pre-read keyboard input. */ static struct input_event kbd_buffer[KBD_BUFFER_SIZE]; @@ -12434,5 +12428,3 @@ mark_kboards (void) } } -/* arch-tag: 774e34d7-6d31-42f3-8397-e079a4e4c9ca - (do not change this comment) */ diff --git a/src/keyboard.h b/src/keyboard.h index 9fd3b48eba9..7f36691a5a3 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -490,6 +490,8 @@ extern unsigned long last_event_timestamp; extern int quit_char; +extern int timers_run; + extern int parse_menu_item (Lisp_Object, int); extern void echo_now (void); @@ -534,5 +536,3 @@ extern int tty_read_avail_input (struct terminal *, int, struct input_event *); extern EMACS_TIME timer_check (int); -/* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 - (do not change this comment) */ diff --git a/src/lisp.h b/src/lisp.h index 6c00aa28c46..8ddd7af79a8 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2736,6 +2736,7 @@ extern void memory_full (void) NO_RETURN; extern void buffer_memory_full (void) NO_RETURN; extern int survives_gc_p (Lisp_Object); extern void mark_object (Lisp_Object); +extern const char *pending_malloc_warning; extern Lisp_Object Vpurify_flag; extern Lisp_Object Vmemory_full; extern Lisp_Object *stack_base; @@ -3233,6 +3234,8 @@ extern Lisp_Object Qdisabled, QCfilter; extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; extern Lisp_Object Qtop, Qratio; +extern Lisp_Object Vsaved_region_selection; +extern Lisp_Object Vselect_active_regions; extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; extern Lisp_Object Vthrow_on_input; extern int input_pending; diff --git a/src/lread.c b/src/lread.c index 945808c6e5a..18d4ba8360e 100644 --- a/src/lread.c +++ b/src/lread.c @@ -552,8 +552,6 @@ readbyte_from_string (int c, Lisp_Object readcharfun) encoded in `emacs-mule' and the first byte is already read in C. */ -extern char emacs_mule_bytes[256]; - static int read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object readcharfun) { diff --git a/src/minibuf.c b/src/minibuf.c index f3a24afc199..0f3def614f2 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -36,8 +36,6 @@ along with GNU Emacs. If not, see . */ #include "keymap.h" #include "termhooks.h" -extern int quit_char; - /* List of buffers for use as minibuffers. The first element of the list is used for the outermost minibuffer invocation, the next element is used for a recursive minibuffer @@ -2242,5 +2240,3 @@ properties. */); defsubr (&Scompleting_read); } -/* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 - (do not change this comment) */ 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.3 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/ChangeLog | 4 ++++ src/process.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/process.c') diff --git a/src/ChangeLog b/src/ChangeLog index 584a81cd88c..82614afb043 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --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.3