* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 184a1bd4b4cf7d74ef469d8a1a19e90f0e370ed8..d4fc44860f53cfe0f616982545ce1a91468fdd6c 100644 (file)
--- 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 9687e39a9fcd27401bffefd1f627729eb9d9a4fc..756e121f6788b18268b1e6e03c7ab73004ac83fb 100644 (file)
--- 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 8f0f6776aaaa0ac2aec09742f5907e9b96aed695..df51c5fdb8884278ae5d5adb1f6070d60f6df908 100644 (file)
--- 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 */
-