diff options
| author | Paul Eggert | 2012-09-02 09:56:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-09-02 09:56:31 -0700 |
| commit | a411ac43d3667d042fa36361275eccbe9aca80af (patch) | |
| tree | 84dce13f623718359f808b9c1b088ce6ad23e7bb /src/alloc.c | |
| parent | c04889f8e34e69ed496fcaaab285eac34e96acc1 (diff) | |
| download | emacs-a411ac43d3667d042fa36361275eccbe9aca80af.tar.gz emacs-a411ac43d3667d042fa36361275eccbe9aca80af.zip | |
Clean up some extern decls.
Mostly, this hoists extern decls out of .c files and into .h files.
That way, we're more likely to catch errors if the interfaces change.
* alloc.c [USE_GTK]: Include "gtkutil.h" so that we need not
declare xg_mark_data.
* dispextern.h (x_frame_parm_handlers):
* font.h (Qxft):
* lisp.h (Qlexical_binding, Qinternal_interpreter_environment)
(Qextra_light, Qlight, Qsemi_light, Qsemi_bold, Qbold, Qextra_bold)
(Qultra_bold, Qoblique, Qitalic):
Move extern decl here from .c file.
* alloc.c (xg_mark_data) [USE_GTK]:
* doc.c (Qclosure):
* eval.c (Qlexical_binding):
* fns.c (time) [!HAVE_UNISTD_H]:
* gtkutil.c (Qxft, Qnormal, Qextra_light, Qlight, Qsemi_light)
(Qsemi_bold, Qbold, Qextra_bold, Qultra_bold, Qoblique, Qitalic):
* image.c (Vlibrary_cache, QCloaded_from) [HAVE_NTGUI]:
* lread.c (Qinternal_interpreter_environment):
* minibuf.c (Qbuffer):
* process.c (QCfamily, QCfilter):
* widget.c (free_frame_faces):
* xfaces.c (free_frame_menubar) [USE_X_TOOLKIT]:
* xfont.c (x_clear_errors):
* xterm.c (x_frame_parm_handlers):
Remove now-redundant extern decls.
* keyboard.c, keyboard.h (ignore_mouse_drag_p) [USE_GTK || HAVE_NS]:
* xfaces.c (Qultra_light, Qreverse_oblique, Qreverse_italic):
Now static.
* xfaces.c: Remove unnecessary static decls.
* xterm.c (updating_frame): Remove decl of nonexistent object.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c index e8637471bc7..188a514376d 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -69,6 +69,9 @@ extern void *sbrk (); | |||
| 69 | 69 | ||
| 70 | #include <fcntl.h> | 70 | #include <fcntl.h> |
| 71 | 71 | ||
| 72 | #ifdef USE_GTK | ||
| 73 | # include "gtkutil.h" | ||
| 74 | #endif | ||
| 72 | #ifdef WINDOWSNT | 75 | #ifdef WINDOWSNT |
| 73 | #include "w32.h" | 76 | #include "w32.h" |
| 74 | #endif | 77 | #endif |
| @@ -5478,10 +5481,7 @@ See Info node `(elisp)Garbage Collection'. */) | |||
| 5478 | mark_kboards (); | 5481 | mark_kboards (); |
| 5479 | 5482 | ||
| 5480 | #ifdef USE_GTK | 5483 | #ifdef USE_GTK |
| 5481 | { | 5484 | xg_mark_data (); |
| 5482 | extern void xg_mark_data (void); | ||
| 5483 | xg_mark_data (); | ||
| 5484 | } | ||
| 5485 | #endif | 5485 | #endif |
| 5486 | 5486 | ||
| 5487 | #if (GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS \ | 5487 | #if (GC_MARK_STACK == GC_MAKE_GCPROS_NOOPS \ |