diff options
| author | Jan D | 2010-08-06 12:12:41 +0200 |
|---|---|---|
| committer | Jan D | 2010-08-06 12:12:41 +0200 |
| commit | 3d608a86503ae057e0d2e721a9d9718eae22bf89 (patch) | |
| tree | 01ae2c34b91e9357f41bda331a8ed4e3422683bf /src/menu.h | |
| parent | 0613f5d515c2f7fe7930ad5f7d3e177e1fd3b44c (diff) | |
| download | emacs-3d608a86503ae057e0d2e721a9d9718eae22bf89.tar.gz emacs-3d608a86503ae057e0d2e721a9d9718eae22bf89.zip | |
Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
* configure.in: Check for util.h.
* src/bidi.c (bidi_dump_cached_states): Fix fprintf warning.
* src/emacs.c: Include src/nsterm.h if HAVE_NS.
* src/image.c (xpm_scan, xpm_make_color_table_v)
(xpm_put_color_table_v, xpm_get_color_table_v)
(xpm_make_color_table_h, xpm_put_color_table_h)
(xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image)
(xpm_load): Convert to ANSI C prototypes.
* src/lisp.h (fmod_float): Declare.
* src/menu.h (x_set_menu_bar_line): Declare.
(free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions.
* src/window.c: Include menu.h.
* src/nsfns.m (have_menus_p, ns_display_info_for_name)
(x_set_cursor_type, ns_appkit_version_str)
(ns_appkit_version_int, ns_do_applescript)
(x_set_scroll_bar_default_width, x_sync, compute_tip_xy)
(syms_of_nsfns): Convert to ANSI C prototypes.
* src/nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C
prototypes.
* src/nsimage.m (ns_load_image): Move NSTRACE after declarations.
* src/nsmenu.m (popup_activated, name_is_separator)
(syms_of_nsmenu): Convert to ANSI C prototypes.
(runMenuAt): Prototypes and move declarations before code.
* src/nsterm.h : Include sysselect.h.
(x_sync, x_get_focus_frame, x_set_mouse_position)
(x_set_mouse_pixel_position, x_make_frame_visible)
(x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height)
(x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines)
(x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select)
(syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect):
Declare
* src/process.c: Check HAVE_UTIL_H. Include src/nsterm.h if HAVE_NS.
* src/nsterm.m (ns_init_paths, ns_alloc_autorelease_pool)
(ns_ring_bell, ns_defined_color, hide_hourglass)
(x_display_pixel_height, x_display_pixel_width, syms_of_nsterm):
Convert to ANSI C prototypes.
(x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations
before code.
* src/sysdep.c: Check HAVE_TERM_H
* src/term.c: Check HAVE_SYS_IOCTL_H.
* src/unexmacosx.c (print_region_list, print_regions)
(build_region_list, find_emacs_zone_regions)
(unexec_regions_merge, read_load_commands, dump_it)
(unexec_init_emacs_zone): Convert to ANSI C prototypes.
* src/xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.
Diffstat (limited to 'src/menu.h')
| -rw-r--r-- | src/menu.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/menu.h b/src/menu.h index 99ae43fe452..c8691169ccb 100644 --- a/src/menu.h +++ b/src/menu.h | |||
| @@ -21,13 +21,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | 21 | ||
| 22 | extern Lisp_Object Vmenu_updating_frame; | 22 | extern Lisp_Object Vmenu_updating_frame; |
| 23 | 23 | ||
| 24 | extern void x_set_menu_bar_lines (struct frame *f, | ||
| 25 | Lisp_Object value, | ||
| 26 | Lisp_Object oldval); | ||
| 27 | |||
| 24 | extern void init_menu_items (void); | 28 | extern void init_menu_items (void); |
| 25 | extern void finish_menu_items (void); | 29 | extern void finish_menu_items (void); |
| 26 | extern void discard_menu_items (void); | 30 | extern void discard_menu_items (void); |
| 27 | extern void save_menu_items (void); | 31 | extern void save_menu_items (void); |
| 28 | extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); | 32 | extern int parse_single_submenu (Lisp_Object, Lisp_Object, Lisp_Object); |
| 29 | extern void list_of_panes (Lisp_Object); | 33 | extern void list_of_panes (Lisp_Object); |
| 30 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) | 34 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) \ |
| 35 | || defined (HAVE_NS) | ||
| 31 | extern void free_menubar_widget_value_tree (widget_value *); | 36 | extern void free_menubar_widget_value_tree (widget_value *); |
| 32 | extern void update_submenu_strings (widget_value *); | 37 | extern void update_submenu_strings (widget_value *); |
| 33 | extern void find_and_call_menu_selection (FRAME_PTR, int, | 38 | extern void find_and_call_menu_selection (FRAME_PTR, int, |