# HG changeset patch # User Dan Nicolaescu # Date 1281121636 25200 # Node ID d9a022ec322cd296ba806e7829b711f27fad04cb # Parent fd6fad9949564ed398110640daca760104725251 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. diff -r fd6fad994956 -r d9a022ec322c src/ChangeLog --- a/src/ChangeLog Fri Aug 06 12:01:35 2010 -0700 +++ b/src/ChangeLog Fri Aug 06 12:07:16 2010 -0700 @@ -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 -r fd6fad994956 -r d9a022ec322c src/eval.c --- a/src/eval.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/eval.c Fri Aug 06 12:07:16 2010 -0700 @@ -1629,7 +1629,6 @@ 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 @@ register int i; Lisp_Object tail; Lisp_Object tem; - extern Lisp_Object Vprint_level; struct gcpro gcpro1; XSETFASTINT (Vprint_level, 3); diff -r fd6fad994956 -r d9a022ec322c src/fileio.c --- a/src/fileio.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/fileio.c Fri Aug 06 12:07:16 2010 -0700 @@ -854,8 +854,6 @@ 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 -r fd6fad994956 -r d9a022ec322c src/gtkutil.c --- a/src/gtkutil.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/gtkutil.c Fri Aug 06 12:07:16 2010 -0700 @@ -291,7 +291,6 @@ { 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 -r fd6fad994956 -r d9a022ec322c src/image.c --- a/src/image.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/image.c Fri Aug 06 12:07:16 2010 -0700 @@ -126,6 +126,9 @@ 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 @@ /* 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 @@ #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 -r fd6fad994956 -r d9a022ec322c src/msdos.c --- a/src/msdos.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/msdos.c Fri Aug 06 12:07:16 2010 -0700 @@ -1453,7 +1453,6 @@ /* Look for a `help-echo' property. */ { Lisp_Object help; - extern Lisp_Object Qhelp_echo; /* Check overlays first. */ help = Qnil; diff -r fd6fad994956 -r d9a022ec322c src/process.c --- a/src/process.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/process.c Fri Aug 06 12:07:16 2010 -0700 @@ -6361,8 +6361,7 @@ { 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 -r fd6fad994956 -r d9a022ec322c src/xdisp.c --- a/src/xdisp.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/xdisp.c Fri Aug 06 12:07:16 2010 -0700 @@ -10195,7 +10195,6 @@ 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 -r fd6fad994956 -r d9a022ec322c src/xterm.c --- a/src/xterm.c Fri Aug 06 12:01:35 2010 -0700 +++ b/src/xterm.c Fri Aug 06 12:07:16 2010 -0700 @@ -7628,7 +7628,6 @@ /* 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;