From 97ec208ffc803b3ed09a23888618a4705584c0ae Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 6 Aug 2010 12:07:16 -0700 Subject: [PATCH] Remove extern declarations in .c files, .h files have them. * src/xterm.c: * src/xdisp.c: * src/process.c: * src/msdos.c: * src/image.c: * src/gtkutil.c: * src/fileio.c: * src/eval.c: Remove declarations. --- src/ChangeLog | 10 ++++++++++ src/eval.c | 2 -- src/fileio.c | 2 -- src/gtkutil.c | 1 - src/image.c | 9 +++------ src/msdos.c | 1 - src/process.c | 3 +-- src/xdisp.c | 1 - src/xterm.c | 1 - 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9a741498861..a92fc774583 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2010-08-06 Dan Nicolaescu + Remove extern declarations in .c files, .h files have them. + * xterm.c: + * xdisp.c: + * process.c: + * msdos.c: + * image.c: + * gtkutil.c: + * fileio.c: + * eval.c: Remove declarations. + * frame.c (frame_params): Make const. * lisp.h (fatal_error_signal, emacs_root_dir): Add declaration. diff --git a/src/eval.c b/src/eval.c index 467662a11d8..f127ef03293 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1629,7 +1629,6 @@ See also the function `condition-case'. */) That is a special case--don't do this in other situations. */ register struct handler *allhandlers = handlerlist; Lisp_Object conditions; - extern int waiting_for_input; Lisp_Object string; Lisp_Object real_error_symbol; struct backtrace *bp; @@ -3432,7 +3431,6 @@ Output stream used is value of `standard-output'. */) register int i; Lisp_Object tail; Lisp_Object tem; - extern Lisp_Object Vprint_level; struct gcpro gcpro1; XSETFASTINT (Vprint_level, 3); diff --git a/src/fileio.c b/src/fileio.c index 6d9ac162b93..f4bad89d0c0 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -854,8 +854,6 @@ filesystem tree, not (expand-file-name ".." dirname). */) To avoid this, we set default_directory to the root of the current drive. */ - extern char *emacs_root_dir (void); - default_directory = build_string (emacs_root_dir ()); #else default_directory = build_string ("/"); diff --git a/src/gtkutil.c b/src/gtkutil.c index bc949a6e49d..840a4633cdd 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -291,7 +291,6 @@ file_for_image (Lisp_Object image) { Lisp_Object specified_file = Qnil; Lisp_Object tail; - extern Lisp_Object QCfile; for (tail = XCDR (image); NILP (specified_file) && CONSP (tail) && CONSP (XCDR (tail)); diff --git a/src/image.c b/src/image.c index 2b8eb1830bc..0ae8bf10399 100644 --- a/src/image.c +++ b/src/image.c @@ -126,6 +126,9 @@ typedef struct ns_bitmap_record Bitmap_Record; Lisp_Object Vx_bitmap_file_path; +/* The symbol `postscript' identifying images of this type. */ + +Lisp_Object Qpostscript; static void x_disable_image (struct frame *, struct image *); static void x_edge_detection (struct frame *, struct image *, Lisp_Object, @@ -1756,8 +1759,6 @@ lookup_image (struct frame *f, Lisp_Object spec) /* If not found, create a new image and cache it. */ if (img == NULL) { - extern Lisp_Object Qpostscript; - BLOCK_INPUT; img = make_image (spec, hash); cache_image (f, img); @@ -7742,10 +7743,6 @@ svg_load_image (struct frame *f, /* Pointer to emacs frame structure. * #define HAVE_GHOSTSCRIPT 1 #endif /* HAVE_X_WINDOWS */ -/* The symbol `postscript' identifying images of this type. */ - -Lisp_Object Qpostscript; - #ifdef HAVE_GHOSTSCRIPT static int gs_image_p (Lisp_Object object); diff --git a/src/msdos.c b/src/msdos.c index fefefd9147c..ad529d00dea 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1453,7 +1453,6 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) /* Look for a `help-echo' property. */ { Lisp_Object help; - extern Lisp_Object Qhelp_echo; /* Check overlays first. */ help = Qnil; diff --git a/src/process.c b/src/process.c index 24786d0e777..56d914ce6d5 100644 --- a/src/process.c +++ b/src/process.c @@ -6361,8 +6361,7 @@ sigchld_handler (int signo) { int old_errno = errno; Lisp_Object proc; - register struct Lisp_Process *p; - extern EMACS_TIME *input_available_clear_time; + struct Lisp_Process *p; SIGNAL_THREAD_CHECK (signo); diff --git a/src/xdisp.c b/src/xdisp.c index 73299c95d1f..2a9c9949be9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -10195,7 +10195,6 @@ build_desired_tool_bar_string (struct frame *f) int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); int hmargin, vmargin, relief, idx, end; - extern Lisp_Object QCrelief, QCmargin, QCconversion; /* If image is a vector, choose the image according to the button state. */ diff --git a/src/xterm.c b/src/xterm.c index dda0867bf04..1be279d0206 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7628,7 +7628,6 @@ x_connection_closed (Display *dpy, const char *error_message) /* If DPYINFO is null, this means we didn't open the display in the first place, so don't try to close it. */ { - extern void (*fatal_error_signal_hook) (void); fatal_error_signal_hook = x_fatal_error_signal; XtCloseDisplay (dpy); fatal_error_signal_hook = NULL; -- 2.39.2