Mercurial > emacs
comparison src/process.c @ 109653:9cfca8c9fb07
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.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Fri, 06 Aug 2010 12:12:41 +0200 |
parents | 9f6ce8311f52 |
children | d9a022ec322c |
comparison
equal
deleted
inserted
replaced
109652:eb720d8ea1c6 | 109653:9cfca8c9fb07 |
---|---|
85 | 85 |
86 #ifdef HAVE_RES_INIT | 86 #ifdef HAVE_RES_INIT |
87 #include <netinet/in.h> | 87 #include <netinet/in.h> |
88 #include <arpa/nameser.h> | 88 #include <arpa/nameser.h> |
89 #include <resolv.h> | 89 #include <resolv.h> |
90 #endif | |
91 | |
92 #ifdef HAVE_UTIL_H | |
93 #include <util.h> | |
90 #endif | 94 #endif |
91 | 95 |
92 #endif /* subprocesses */ | 96 #endif /* subprocesses */ |
93 | 97 |
94 #include "lisp.h" | 98 #include "lisp.h" |
114 #include "syswait.h" | 118 #include "syswait.h" |
115 | 119 |
116 #if defined (USE_GTK) || defined (HAVE_GCONF) | 120 #if defined (USE_GTK) || defined (HAVE_GCONF) |
117 #include "xgselect.h" | 121 #include "xgselect.h" |
118 #endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ | 122 #endif /* defined (USE_GTK) || defined (HAVE_GCONF) */ |
119 | 123 #ifdef HAVE_NS |
124 #include "nsterm.h" | |
125 #endif | |
120 extern int timers_run; | 126 extern int timers_run; |
121 | 127 |
122 Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; | 128 Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; |
123 Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; | 129 Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; |
124 Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; | 130 Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; |