diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-26 23:30:02 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-26 23:30:02 -0800 |
| commit | 0ff162fccf6ba6f1b8a5f331428091c78c966aa1 (patch) | |
| tree | 8f16ef541cdfb2d9b4fa893abd0d9b5827bf3e14 | |
| parent | fdb0b28bf67cd41fd2edd5084984e714c8de6b4c (diff) | |
| download | emacs-0ff162fccf6ba6f1b8a5f331428091c78c966aa1.tar.gz emacs-0ff162fccf6ba6f1b8a5f331428091c78c966aa1.tar.bz2 emacs-0ff162fccf6ba6f1b8a5f331428091c78c966aa1.zip | |
* frame.h: Avoid gcc -Wmissing-prototypes diagnostics.
(set_menu_bar_lines, x_get_resource_string): New decls.
* msdos.c (set_menu_bar_lines): Omit decl.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.h | 8 | ||||
| -rw-r--r-- | src/msdos.c | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 184a1bd4b4c..d4fc44860f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-02-27 Paul Eggert <eggert@cs.ucla.edu> + * frame.h: Avoid gcc -Wmissing-prototypes diagnostics. + (set_menu_bar_lines, x_get_resource_string): New decls. + * msdos.c (set_menu_bar_lines): Omit decl. + * dispextern.h (struct glyph): Make u.img_id int, not unsigned. It's always given int values and used as an int. This suppresses a gcc "comparison of unsigned expression >= 0" warning in some diff --git a/src/frame.h b/src/frame.h index 9687e39a9fc..756e121f678 100644 --- a/src/frame.h +++ b/src/frame.h @@ -841,6 +841,7 @@ extern Lisp_Object Qnoelisp; extern struct frame *last_nonminibuf_frame; +extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern struct frame *make_initial_frame (void); extern struct frame *make_terminal_frame (struct terminal *); extern struct frame *make_frame (int); @@ -1131,17 +1132,20 @@ extern int x_figure_window_size (struct frame *, Lisp_Object, int); extern void x_set_alpha (struct frame *, Lisp_Object, Lisp_Object); extern void validate_x_resource_name (void); - + extern Lisp_Object display_x_get_resource (Display_Info *, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass); +#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT +extern char *x_get_resource_string (const char *, const char *); +#endif + /* In xmenu.c */ extern void set_frame_menubar (FRAME_PTR, int, int); #endif /* HAVE_WINDOW_SYSTEM */ #endif /* not EMACS_FRAME_H */ - diff --git a/src/msdos.c b/src/msdos.c index 8f0f6776aaa..df51c5fdb88 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1389,8 +1389,6 @@ IT_delete_glyphs (struct frame *f, int n) void x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { - extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); - set_menu_bar_lines (f, value, oldval); } @@ -4236,4 +4234,3 @@ This variable is used only by MS-DOS terminals. */); } #endif /* MSDOS */ - |