diff options
| author | Dan Nicolaescu | 2010-08-06 12:07:16 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-08-06 12:07:16 -0700 |
| commit | 97ec208ffc803b3ed09a23888618a4705584c0ae (patch) | |
| tree | 6935f0aca3bc269dc833c90857bb4d0c49b64390 /src | |
| parent | 94eed851df0da19cf004fd8cb3608b16dee47f73 (diff) | |
| download | emacs-97ec208ffc803b3ed09a23888618a4705584c0ae.tar.gz emacs-97ec208ffc803b3ed09a23888618a4705584c0ae.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/gtkutil.c | 1 | ||||
| -rw-r--r-- | src/image.c | 9 | ||||
| -rw-r--r-- | src/msdos.c | 1 | ||||
| -rw-r--r-- | src/process.c | 3 | ||||
| -rw-r--r-- | src/xdisp.c | 1 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | Remove extern declarations in .c files, .h files have them. | ||
| 4 | * xterm.c: | ||
| 5 | * xdisp.c: | ||
| 6 | * process.c: | ||
| 7 | * msdos.c: | ||
| 8 | * image.c: | ||
| 9 | * gtkutil.c: | ||
| 10 | * fileio.c: | ||
| 11 | * eval.c: Remove declarations. | ||
| 12 | |||
| 3 | * frame.c (frame_params): Make const. | 13 | * frame.c (frame_params): Make const. |
| 4 | 14 | ||
| 5 | * lisp.h (fatal_error_signal, emacs_root_dir): Add declaration. | 15 | * 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'. */) | |||
| 1629 | That is a special case--don't do this in other situations. */ | 1629 | That is a special case--don't do this in other situations. */ |
| 1630 | register struct handler *allhandlers = handlerlist; | 1630 | register struct handler *allhandlers = handlerlist; |
| 1631 | Lisp_Object conditions; | 1631 | Lisp_Object conditions; |
| 1632 | extern int waiting_for_input; | ||
| 1633 | Lisp_Object string; | 1632 | Lisp_Object string; |
| 1634 | Lisp_Object real_error_symbol; | 1633 | Lisp_Object real_error_symbol; |
| 1635 | struct backtrace *bp; | 1634 | struct backtrace *bp; |
| @@ -3432,7 +3431,6 @@ Output stream used is value of `standard-output'. */) | |||
| 3432 | register int i; | 3431 | register int i; |
| 3433 | Lisp_Object tail; | 3432 | Lisp_Object tail; |
| 3434 | Lisp_Object tem; | 3433 | Lisp_Object tem; |
| 3435 | extern Lisp_Object Vprint_level; | ||
| 3436 | struct gcpro gcpro1; | 3434 | struct gcpro gcpro1; |
| 3437 | 3435 | ||
| 3438 | XSETFASTINT (Vprint_level, 3); | 3436 | 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). */) | |||
| 854 | 854 | ||
| 855 | To avoid this, we set default_directory to the root of the | 855 | To avoid this, we set default_directory to the root of the |
| 856 | current drive. */ | 856 | current drive. */ |
| 857 | extern char *emacs_root_dir (void); | ||
| 858 | |||
| 859 | default_directory = build_string (emacs_root_dir ()); | 857 | default_directory = build_string (emacs_root_dir ()); |
| 860 | #else | 858 | #else |
| 861 | default_directory = build_string ("/"); | 859 | 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) | |||
| 291 | { | 291 | { |
| 292 | Lisp_Object specified_file = Qnil; | 292 | Lisp_Object specified_file = Qnil; |
| 293 | Lisp_Object tail; | 293 | Lisp_Object tail; |
| 294 | extern Lisp_Object QCfile; | ||
| 295 | 294 | ||
| 296 | for (tail = XCDR (image); | 295 | for (tail = XCDR (image); |
| 297 | NILP (specified_file) && CONSP (tail) && CONSP (XCDR (tail)); | 296 | 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; | |||
| 126 | 126 | ||
| 127 | Lisp_Object Vx_bitmap_file_path; | 127 | Lisp_Object Vx_bitmap_file_path; |
| 128 | 128 | ||
| 129 | /* The symbol `postscript' identifying images of this type. */ | ||
| 130 | |||
| 131 | Lisp_Object Qpostscript; | ||
| 129 | 132 | ||
| 130 | static void x_disable_image (struct frame *, struct image *); | 133 | static void x_disable_image (struct frame *, struct image *); |
| 131 | static void x_edge_detection (struct frame *, struct image *, Lisp_Object, | 134 | static void x_edge_detection (struct frame *, struct image *, Lisp_Object, |
| @@ -1756,8 +1759,6 @@ lookup_image (struct frame *f, Lisp_Object spec) | |||
| 1756 | /* If not found, create a new image and cache it. */ | 1759 | /* If not found, create a new image and cache it. */ |
| 1757 | if (img == NULL) | 1760 | if (img == NULL) |
| 1758 | { | 1761 | { |
| 1759 | extern Lisp_Object Qpostscript; | ||
| 1760 | |||
| 1761 | BLOCK_INPUT; | 1762 | BLOCK_INPUT; |
| 1762 | img = make_image (spec, hash); | 1763 | img = make_image (spec, hash); |
| 1763 | cache_image (f, img); | 1764 | cache_image (f, img); |
| @@ -7742,10 +7743,6 @@ svg_load_image (struct frame *f, /* Pointer to emacs frame structure. * | |||
| 7742 | #define HAVE_GHOSTSCRIPT 1 | 7743 | #define HAVE_GHOSTSCRIPT 1 |
| 7743 | #endif /* HAVE_X_WINDOWS */ | 7744 | #endif /* HAVE_X_WINDOWS */ |
| 7744 | 7745 | ||
| 7745 | /* The symbol `postscript' identifying images of this type. */ | ||
| 7746 | |||
| 7747 | Lisp_Object Qpostscript; | ||
| 7748 | |||
| 7749 | #ifdef HAVE_GHOSTSCRIPT | 7746 | #ifdef HAVE_GHOSTSCRIPT |
| 7750 | 7747 | ||
| 7751 | static int gs_image_p (Lisp_Object object); | 7748 | 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) | |||
| 1453 | /* Look for a `help-echo' property. */ | 1453 | /* Look for a `help-echo' property. */ |
| 1454 | { | 1454 | { |
| 1455 | Lisp_Object help; | 1455 | Lisp_Object help; |
| 1456 | extern Lisp_Object Qhelp_echo; | ||
| 1457 | 1456 | ||
| 1458 | /* Check overlays first. */ | 1457 | /* Check overlays first. */ |
| 1459 | help = Qnil; | 1458 | 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) | |||
| 6361 | { | 6361 | { |
| 6362 | int old_errno = errno; | 6362 | int old_errno = errno; |
| 6363 | Lisp_Object proc; | 6363 | Lisp_Object proc; |
| 6364 | register struct Lisp_Process *p; | 6364 | struct Lisp_Process *p; |
| 6365 | extern EMACS_TIME *input_available_clear_time; | ||
| 6366 | 6365 | ||
| 6367 | SIGNAL_THREAD_CHECK (signo); | 6366 | SIGNAL_THREAD_CHECK (signo); |
| 6368 | 6367 | ||
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) | |||
| 10195 | int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | 10195 | int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); |
| 10196 | int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | 10196 | int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); |
| 10197 | int hmargin, vmargin, relief, idx, end; | 10197 | int hmargin, vmargin, relief, idx, end; |
| 10198 | extern Lisp_Object QCrelief, QCmargin, QCconversion; | ||
| 10199 | 10198 | ||
| 10200 | /* If image is a vector, choose the image according to the | 10199 | /* If image is a vector, choose the image according to the |
| 10201 | button state. */ | 10200 | 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) | |||
| 7628 | /* If DPYINFO is null, this means we didn't open the display | 7628 | /* If DPYINFO is null, this means we didn't open the display |
| 7629 | in the first place, so don't try to close it. */ | 7629 | in the first place, so don't try to close it. */ |
| 7630 | { | 7630 | { |
| 7631 | extern void (*fatal_error_signal_hook) (void); | ||
| 7632 | fatal_error_signal_hook = x_fatal_error_signal; | 7631 | fatal_error_signal_hook = x_fatal_error_signal; |
| 7633 | XtCloseDisplay (dpy); | 7632 | XtCloseDisplay (dpy); |
| 7634 | fatal_error_signal_hook = NULL; | 7633 | fatal_error_signal_hook = NULL; |