aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.h
diff options
context:
space:
mode:
authorPaul Eggert2014-06-08 11:27:22 -0700
committerPaul Eggert2014-06-08 11:27:22 -0700
commitff2d0e8336c05cb7d3e86f7406784cefc1d6589e (patch)
tree05c8974f47e1eee47c7ad5b39379a6687d15217d /src/menu.h
parent83f1450065c55a3e5dce5db0da737cb7a6a4d60c (diff)
downloademacs-ff2d0e8336c05cb7d3e86f7406784cefc1d6589e.tar.gz
emacs-ff2d0e8336c05cb7d3e86f7406784cefc1d6589e.zip
If a C name must be extern on some platforms, make it extern on all.
* dispextern.h (set_vertical_scroll_bar, erase_phys_cursor) (load_color): * font.h (ftxfont_driver) [HAVE_XFT]: * keyboard.h (menu_items_inuse, ignore_mouse_drag_p, make_ctrl_char): * lisp.h (get_frame_param): * menu.h (tty_menu_show): * process.h (conv_sockaddr_to_lisp, catch_child_signal): * termhooks.h (encode_terminal_code): * xterm.h (x_menu_wait_for_event): Always declare. * frame.c (get_frame_param): * fringe.c (max_used_fringe_bitmap): * ftxfont.c (ftxfont_driver): * keyboard.c (ignore_mouse_drag_p, make_ctrl_char): * menu.c (menu_items_inuse): * process.c (conv_sockaddr_to_lisp, catch_child_signal): * term.c (encode_terminal_code, tty_menu_show): * xdisp.c (set_vertical_scroll_bar, erase_phys_cursor): * xfaces.c (load_color): * xmenu.c (x_menu_wait_for_event): Now always extern.
Diffstat (limited to 'src/menu.h')
-rw-r--r--src/menu.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/menu.h b/src/menu.h
index 42038f54b67..643ff40fef8 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -64,14 +64,12 @@ extern Lisp_Object x_menu_show (struct frame *, int, int, int,
64#ifdef HAVE_NTGUI 64#ifdef HAVE_NTGUI
65extern Lisp_Object w32_menu_show (struct frame *, int, int, int, 65extern Lisp_Object w32_menu_show (struct frame *, int, int, int,
66 Lisp_Object, const char **); 66 Lisp_Object, const char **);
67#ifdef WINDOWSNT
68extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
69 Lisp_Object, const char **);
70#endif
71#endif 67#endif
72#ifdef HAVE_NS 68#ifdef HAVE_NS
73extern Lisp_Object ns_menu_show (struct frame *, int, int, int, 69extern Lisp_Object ns_menu_show (struct frame *, int, int, int,
74 Lisp_Object, const char **); 70 Lisp_Object, const char **);
75#endif 71#endif
72extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
73 Lisp_Object, const char **);
76extern ptrdiff_t menu_item_width (const unsigned char *); 74extern ptrdiff_t menu_item_width (const unsigned char *);
77#endif /* MENU_H */ 75#endif /* MENU_H */