diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-17 09:09:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-17 09:09:19 -0700 |
| commit | 73bfe891e2cf3e9b693938fe94c1ead1bc9b318d (patch) | |
| tree | b666e09276fdb67e80bdf05fa94649d98edb2b2f /lib-src | |
| parent | 319e8ddc53c72c94b570318adbb9726f1ae0418a (diff) | |
| download | emacs-73bfe891e2cf3e9b693938fe94c1ead1bc9b318d.tar.gz | |
Omit redundant extern decls.
Most of this patch is from Dmitry Antipov, in:
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html
* configure.ac (WERROR_CFLAGS): Add -Wredundant-decls.
* lib-src/emacsclient.c (getenv): Remove decl.
* lib-src/make-docfile.c (write_globals): Add ATTRIBUTE_CONST for
Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity.
* lwlib/lwlib-Xm.c (lw_motif_widget_p, xm_update_one_value)
(xm_create_dialog, xm_destroy_instance, xm_popup_menu)
(xm_set_keyboard_focus, xm_set_main_areas): Remove decls.
* src/commands.h (update_mode_lines):
* src/frame.h (Qbackground_color, Qforeground_color)
(x_set_menu_bar_lines):
* src/ftfont.c (ftfont_font_format):
* src/intervals.h (Qkeymap, Qfont):
* src/keyboard.c (timer_check, safe_run_hooks, Qregion_extract_function):
* src/lisp.h (Ffboundp, Qnil, Qt, Qlambda, Qintegerp, Qwholenump)
(Qsymbolp, Qlisp, Qconsp, Qstringp, Qarrayp, Qbufferp, Qmarkerp)
(Qvectorp, Qbuffer_or_string_p, Qchar_table_p, Qvector_or_char_table_p)
(Qfloatp, Qnumberp, Qfont_spec, Qfont_entity, Qfont_object)
(Fbyteorder, wrong_type_argument, Fmax_char, syms_of_composite)
(Fidentity, extract_float, init_display, syms_of_display, Qdisplay):
(Qimage, Qbox, redisplay_preserve_echo_area, char_table_ref)
(char_table_set, char_table_translate, Qautoload, Qbottom, Qtop)
(Qvisible, Qfont, Qfront_sticky, Qrear_nonsticky, init_sigio)
(Qtool_bar, Qheader_line):
* src/macros.c (Fexecute_kbd_macro):
* src/xdisp.c (Ftool_bar_height, Ftool_bar_height):
* src/xterm.c (x_delete_terminal, XSetIMValues):
* src/xterm.h (x_set_window_size, x_query_color, x_get_focus_frame)
(x_implicitly_set_name, popup_activated)
(widget_store_internal_border):
Remove redundant decls.
* src/frame.c [USE_X_TOOLKIT]: Include widget.h.
* src/keyboard.c (Fexit_recursive_edit, Fabort_recursive_edit):
Remove _Noreturn, as make-docfile now does that for us.
* src/lisp.h (DEFUN): Don't declare fnname here; rely on make-docfile.
(Qregion_extract_function): New decl.
* src/window.c, src/xfns.c: Include menu.h.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 7 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 4 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ba801f024db..1fc9fcdb1f5 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2014-06-17 Paul Eggert <eggert@cs.ucla.edu> + + Omit redundant extern decls. + * emacsclient.c (getenv): Remove decl. + * make-docfile.c (write_globals): Add ATTRIBUTE_CONST for + Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity. + 2014-06-15 Glenn Morris <rgm@gnu.org> * Makefile.in (LDFLAGS): Explicitly set via configure. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index a1177f54576..ddc1b6de5e3 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -82,10 +82,6 @@ char *w32_getenv (char *); #include <signal.h> #include <errno.h> - - -char *getenv (const char *); - #ifndef VERSION #define VERSION "unspecified" #endif diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 2eb2413815e..15ffa138b51 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -665,6 +665,7 @@ write_globals (void) || strcmp (globals[i].name, "Fexit_recursive_edit") == 0 || strcmp (globals[i].name, "Fabort_recursive_edit") == 0) fprintf (outfile, "_Noreturn "); + fprintf (outfile, "EXFUN (%s, ", globals[i].name); if (globals[i].value == -1) fprintf (outfile, "MANY"); @@ -672,7 +673,17 @@ write_globals (void) fprintf (outfile, "UNEVALLED"); else fprintf (outfile, "%d", globals[i].value); - fprintf (outfile, ");\n"); + fprintf (outfile, ")"); + + /* It would be nice to have a cleaner way to deal with these + special hacks, too. */ + if (strcmp (globals[i].name, "Fbyteorder") == 0 + || strcmp (globals[i].name, "Ftool_bar_height") == 0 + || strcmp (globals[i].name, "Fmax_char") == 0 + || strcmp (globals[i].name, "Fidentity") == 0) + fprintf (outfile, " ATTRIBUTE_CONST"); + + fprintf (outfile, ";\n"); } while (i + 1 < num_globals |