diff options
| -rw-r--r-- | src/ChangeLog | 84 | ||||
| -rw-r--r-- | src/alloc.c | 24 | ||||
| -rw-r--r-- | src/buffer.c | 92 | ||||
| -rw-r--r-- | src/category.c | 2 | ||||
| -rw-r--r-- | src/charset.c | 2 | ||||
| -rw-r--r-- | src/coding.c | 10 | ||||
| -rw-r--r-- | src/dispnew.c | 14 | ||||
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/fns.c | 2 | ||||
| -rw-r--r-- | src/frame.c | 4 | ||||
| -rw-r--r-- | src/gmalloc.c | 2 | ||||
| -rw-r--r-- | src/intervals.c | 14 | ||||
| -rw-r--r-- | src/keyboard.c | 22 | ||||
| -rw-r--r-- | src/lread.c | 2 | ||||
| -rw-r--r-- | src/marker.c | 6 | ||||
| -rw-r--r-- | src/nsterm.m | 2 | ||||
| -rw-r--r-- | src/process.c | 32 | ||||
| -rw-r--r-- | src/syntax.c | 4 | ||||
| -rw-r--r-- | src/terminal.c | 2 | ||||
| -rw-r--r-- | src/textprop.c | 4 | ||||
| -rw-r--r-- | src/window.c | 40 | ||||
| -rw-r--r-- | src/xdisp.c | 42 | ||||
| -rw-r--r-- | src/xfaces.c | 38 | ||||
| -rw-r--r-- | src/xml.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 8 |
25 files changed, 271 insertions, 187 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b8471445479..ec629fb9f10 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,89 @@ 2012-10-01 Paul Eggert <eggert@cs.ucla.edu> + Prefer plain 'static' to 'static inline' (Bug#12541). + With static functions, modern compilers inline pretty well by + themselves; advice from programmers often hurts as much as it helps. + On my host (x86-64, Fedora 17, GCC 4.7.2, default 'configure'), + this change shrinks the text size of the Emacs executable by 1.1% + without affecting CPU significantly in my benchmark. + * alloc.c (mem_find, live_string_p, live_cons_p, live_symbol_p) + (live_float_p, live_misc_p, live_vector_p, live_buffer_p) + (mark_maybe_object, mark_maybe_pointer, bounded_number): + * buffer.c (bset_abbrev_mode, bset_abbrev_table) + (bset_auto_fill_function, bset_auto_save_file_format) + (bset_auto_save_file_name, bset_backed_up, bset_begv_marker) + (bset_bidi_display_reordering, bset_buffer_file_coding_system) + (bset_cache_long_line_scans, bset_case_fold_search) + (bset_ctl_arrow, bset_cursor_in_non_selected_windows) + (bset_cursor_type, bset_display_table, bset_extra_line_spacing) + (bset_file_format, bset_file_truename, bset_fringe_cursor_alist) + (bset_fringe_indicator_alist, bset_fringes_outside_margins) + (bset_header_line_format, bset_indicate_buffer_boundaries) + (bset_indicate_empty_lines, bset_invisibility_spec) + (bset_left_fringe_width, bset_major_mode, bset_mark) + (bset_minor_modes, bset_mode_line_format, bset_mode_name) + (bset_name, bset_overwrite_mode, bset_pt_marker) + (bset_right_fringe_width, bset_save_length) + (bset_scroll_bar_width, bset_scroll_down_aggressively) + (bset_scroll_up_aggressively, bset_selective_display) + (bset_selective_display_ellipses, bset_vertical_scroll_bar_type) + (bset_word_wrap, bset_zv_marker, set_buffer_overlays_before) + (set_buffer_overlays_after): + * category.c (bset_category_table): + * charset.c (read_hex): + * coding.c (produce_composition, produce_charset) + (handle_composition_annotation, handle_charset_annotation) + (char_encodable_p): + * dispnew.c (swap_glyph_pointers, copy_row_except_pointers) + (assign_row, set_frame_matrix_frame, make_current) + (add_row_entry): + * eval.c (set_specpdl_symbol, set_specpdl_old_value): + * fns.c (maybe_resize_hash_table): + * frame.c (fset_buffer_predicate, fset_minibuffer_window): + * gmalloc.c (register_heapinfo): + * image.c (lookup_image_type): + * intervals.c (set_interval_object, set_interval_left) + (set_interval_right, copy_interval_parent, rotate_right) + (rotate_left, balance_possible_root_interval): + * keyboard.c (kset_echo_string, kset_kbd_queue) + (kset_keyboard_translate_table, kset_last_prefix_arg) + (kset_last_repeatable_command, kset_local_function_key_map) + (kset_overriding_terminal_local_map, kset_real_last_command) + (kset_system_key_syms, clear_event, set_prop): + * lread.c (digit_to_number): + * marker.c (attach_marker, live_buffer, set_marker_internal): + * nsterm.m (ns_compute_glyph_string_overhangs): + * process.c (pset_buffer, pset_command) + (pset_decode_coding_system, pset_decoding_buf) + (pset_encode_coding_system, pset_encoding_buf, pset_filter) + (pset_log, pset_mark, pset_name, pset_plist, pset_sentinel) + (pset_status, pset_tty_name, pset_type, pset_write_queue): + * syntax.c (bset_syntax_table, dec_bytepos): + * terminal.c (tset_param_alist): + * textprop.c (interval_has_some_properties) + (interval_has_some_properties_list): + * window.c (wset_combination_limit, wset_dedicated) + (wset_display_table, wset_hchild, wset_left_fringe_width) + (wset_left_margin_cols, wset_new_normal, wset_new_total) + (wset_normal_cols, wset_normal_lines, wset_parent, wset_pointm) + (wset_right_fringe_width, wset_right_margin_cols) + (wset_scroll_bar_width, wset_start, wset_temslot, wset_vchild) + (wset_vertical_scroll_bar_type, wset_window_parameters): + * xdisp.c (wset_base_line_number, wset_base_line_pos) + (wset_column_number_displayed, wset_region_showing) + (window_box_edges, run_window_scroll_functions) + (append_glyph_string_lists, prepend_glyph_string_lists) + (append_glyph_string, set_glyph_string_background_width) + (append_glyph, append_composite_glyph) + (take_vertical_position_into_account): + * xfaces.c (x_create_gc, x_free_gc, merge_face_vectors) + (face_attr_equal_p, lface_equal_p, hash_string_case_insensitive) + (lface_hash, lface_same_font_attributes_p, lookup_face): + * xml.c (libxml2_loaded_p): + * xterm.c (x_set_mode_line_face_gc, x_set_glyph_string_gc) + (x_set_glyph_string_clipping, x_clear_glyph_string_rect): + Now 'static', not 'static inline'. + * bidi.c: Tune. (bidi_copy_it): Do the whole copy with a single memcpy. (bidi_char_at_pos): Merge the two STRING_CHAR calls into one. diff --git a/src/alloc.c b/src/alloc.c index 9278f226b69..3ed8cc2d990 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -355,7 +355,7 @@ static void mem_rotate_left (struct mem_node *); static void mem_rotate_right (struct mem_node *); static void mem_delete (struct mem_node *); static void mem_delete_fixup (struct mem_node *); -static inline struct mem_node *mem_find (void *); +static struct mem_node *mem_find (void *); #endif @@ -3550,7 +3550,7 @@ mem_init (void) /* Value is a pointer to the mem_node containing START. Value is MEM_NIL if there is no node in the tree containing START. */ -static inline struct mem_node * +static struct mem_node * mem_find (void *start) { struct mem_node *p; @@ -3926,7 +3926,7 @@ mem_delete_fixup (struct mem_node *x) /* Value is non-zero if P is a pointer to a live Lisp string on the heap. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_string_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_STRING) @@ -3949,7 +3949,7 @@ live_string_p (struct mem_node *m, void *p) /* Value is non-zero if P is a pointer to a live Lisp cons on the heap. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_cons_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_CONS) @@ -3975,7 +3975,7 @@ live_cons_p (struct mem_node *m, void *p) /* Value is non-zero if P is a pointer to a live Lisp symbol on the heap. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_symbol_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_SYMBOL) @@ -4001,7 +4001,7 @@ live_symbol_p (struct mem_node *m, void *p) /* Value is non-zero if P is a pointer to a live Lisp float on the heap. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_float_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_FLOAT) @@ -4025,7 +4025,7 @@ live_float_p (struct mem_node *m, void *p) /* Value is non-zero if P is a pointer to a live Lisp Misc on the heap. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_misc_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_MISC) @@ -4051,7 +4051,7 @@ live_misc_p (struct mem_node *m, void *p) /* Value is non-zero if P is a pointer to a live vector-like object. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_vector_p (struct mem_node *m, void *p) { if (m->type == MEM_TYPE_VECTOR_BLOCK) @@ -4087,7 +4087,7 @@ live_vector_p (struct mem_node *m, void *p) /* Value is non-zero if P is a pointer to a live buffer. M is a pointer to the mem_block for P. */ -static inline bool +static bool live_buffer_p (struct mem_node *m, void *p) { /* P must point to the start of the block, and the buffer @@ -4153,7 +4153,7 @@ DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "", /* Mark OBJ if we can prove it's a Lisp_Object. */ -static inline void +static void mark_maybe_object (Lisp_Object obj) { void *po; @@ -4222,7 +4222,7 @@ mark_maybe_object (Lisp_Object obj) /* If P points to Lisp data, mark that as live if it isn't already marked. */ -static inline void +static void mark_maybe_pointer (void *p) { struct mem_node *m; @@ -5052,7 +5052,7 @@ inhibit_garbage_collection (void) /* Used to avoid possible overflows when converting from C to Lisp integers. */ -static inline Lisp_Object +static Lisp_Object bounded_number (EMACS_INT number) { return make_number (min (MOST_POSITIVE_FIXNUM, number)); diff --git a/src/buffer.c b/src/buffer.c index 356a308fce6..580ea671b43 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -150,222 +150,222 @@ static void modify_overlay (struct buffer *, ptrdiff_t, ptrdiff_t); static Lisp_Object buffer_lisp_local_variables (struct buffer *, bool); /* These setters are used only in this file, so they can be private. */ -static inline void +static void bset_abbrev_mode (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (abbrev_mode) = val; } -static inline void +static void bset_abbrev_table (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (abbrev_table) = val; } -static inline void +static void bset_auto_fill_function (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (auto_fill_function) = val; } -static inline void +static void bset_auto_save_file_format (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (auto_save_file_format) = val; } -static inline void +static void bset_auto_save_file_name (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (auto_save_file_name) = val; } -static inline void +static void bset_backed_up (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (backed_up) = val; } -static inline void +static void bset_begv_marker (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (begv_marker) = val; } -static inline void +static void bset_bidi_display_reordering (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (bidi_display_reordering) = val; } -static inline void +static void bset_buffer_file_coding_system (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (buffer_file_coding_system) = val; } -static inline void +static void bset_cache_long_line_scans (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (cache_long_line_scans) = val; } -static inline void +static void bset_case_fold_search (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (case_fold_search) = val; } -static inline void +static void bset_ctl_arrow (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (ctl_arrow) = val; } -static inline void +static void bset_cursor_in_non_selected_windows (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (cursor_in_non_selected_windows) = val; } -static inline void +static void bset_cursor_type (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (cursor_type) = val; } -static inline void +static void bset_display_table (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (display_table) = val; } -static inline void +static void bset_extra_line_spacing (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (extra_line_spacing) = val; } -static inline void +static void bset_file_format (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (file_format) = val; } -static inline void +static void bset_file_truename (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (file_truename) = val; } -static inline void +static void bset_fringe_cursor_alist (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (fringe_cursor_alist) = val; } -static inline void +static void bset_fringe_indicator_alist (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (fringe_indicator_alist) = val; } -static inline void +static void bset_fringes_outside_margins (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (fringes_outside_margins) = val; } -static inline void +static void bset_header_line_format (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (header_line_format) = val; } -static inline void +static void bset_indicate_buffer_boundaries (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (indicate_buffer_boundaries) = val; } -static inline void +static void bset_indicate_empty_lines (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (indicate_empty_lines) = val; } -static inline void +static void bset_invisibility_spec (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (invisibility_spec) = val; } -static inline void +static void bset_left_fringe_width (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (left_fringe_width) = val; } -static inline void +static void bset_major_mode (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (major_mode) = val; } -static inline void +static void bset_mark (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (mark) = val; } -static inline void +static void bset_minor_modes (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (minor_modes) = val; } -static inline void +static void bset_mode_line_format (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (mode_line_format) = val; } -static inline void +static void bset_mode_name (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (mode_name) = val; } -static inline void +static void bset_name (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (name) = val; } -static inline void +static void bset_overwrite_mode (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (overwrite_mode) = val; } -static inline void +static void bset_pt_marker (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (pt_marker) = val; } -static inline void +static void bset_right_fringe_width (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (right_fringe_width) = val; } -static inline void +static void bset_save_length (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (save_length) = val; } -static inline void +static void bset_scroll_bar_width (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (scroll_bar_width) = val; } -static inline void +static void bset_scroll_down_aggressively (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (scroll_down_aggressively) = val; } -static inline void +static void bset_scroll_up_aggressively (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (scroll_up_aggressively) = val; } -static inline void +static void bset_selective_display (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (selective_display) = val; } -static inline void +static void bset_selective_display_ellipses (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (selective_display_ellipses) = val; } -static inline void +static void bset_vertical_scroll_bar_type (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (vertical_scroll_bar_type) = val; } -static inline void +static void bset_word_wrap (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (word_wrap) = val; } -static inline void +static void bset_zv_marker (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (zv_marker) = val; @@ -651,13 +651,13 @@ copy_overlays (struct buffer *b, struct Lisp_Overlay *list) /* Set an appropriate overlay of B. */ -static inline void +static void set_buffer_overlays_before (struct buffer *b, struct Lisp_Overlay *o) { b->overlays_before = o; } -static inline void +static void set_buffer_overlays_after (struct buffer *b, struct Lisp_Overlay *o) { b->overlays_after = o; diff --git a/src/category.c b/src/category.c index 01a6f54ad17..fe02303f679 100644 --- a/src/category.c +++ b/src/category.c @@ -40,7 +40,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "keymap.h" /* This setter is used only in this file, so it can be private. */ -static inline void +static void bset_category_table (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (category_table) = val; diff --git a/src/charset.c b/src/charset.c index b0915ffde9c..6b999824dab 100644 --- a/src/charset.c +++ b/src/charset.c @@ -421,7 +421,7 @@ load_charset_map (struct charset *charset, struct charset_map_entries *entries, /* Read a hexadecimal number (preceded by "0x") from the file FP while paying attention to comment character '#'. */ -static inline unsigned +static unsigned read_hex (FILE *fp, bool *eof, bool *overflow) { int c; diff --git a/src/coding.c b/src/coding.c index 32d300b9923..d9606cf5710 100644 --- a/src/coding.c +++ b/src/coding.c @@ -6822,7 +6822,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table, [ -LENGTH ANNOTATION_MASK NCHARS NBYTES METHOD [ COMPONENTS... ] ] */ -static inline void +static void produce_composition (struct coding_system *coding, int *charbuf, ptrdiff_t pos) { int len; @@ -6866,7 +6866,7 @@ produce_composition (struct coding_system *coding, int *charbuf, ptrdiff_t pos) [ -LENGTH ANNOTATION_MASK NCHARS CHARSET-ID ] */ -static inline void +static void produce_charset (struct coding_system *coding, int *charbuf, ptrdiff_t pos) { ptrdiff_t from = pos - charbuf[2]; @@ -7101,7 +7101,7 @@ decode_coding (struct coding_system *coding) position of a composition after POS (if any) or to LIMIT, and return BUF. */ -static inline int * +static int * handle_composition_annotation (ptrdiff_t pos, ptrdiff_t limit, struct coding_system *coding, int *buf, ptrdiff_t *stop) @@ -7184,7 +7184,7 @@ handle_composition_annotation (ptrdiff_t pos, ptrdiff_t limit, If the property value is nil, set *STOP to the position where the property value is non-nil (limiting by LIMIT), and return BUF. */ -static inline int * +static int * handle_charset_annotation (ptrdiff_t pos, ptrdiff_t limit, struct coding_system *coding, int *buf, ptrdiff_t *stop) @@ -8429,7 +8429,7 @@ highest priority. */) } -static inline bool +static bool char_encodable_p (int c, Lisp_Object attrs) { Lisp_Object tail; diff --git a/src/dispnew.c b/src/dispnew.c index 555136d785c..6f8fb10b41d 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1028,7 +1028,7 @@ swap_glyphs_in_rows (struct glyph_row *a, struct glyph_row *b) these should all go together for the row's hash value to be correct. */ -static inline void +static void swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b) { int i; @@ -1057,7 +1057,7 @@ swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b) that glyph pointers, the `used' counts, and the hash values in the structures are left unchanged. */ -static inline void +static void copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) { struct glyph *pointers[1 + LAST_AREA]; @@ -1084,7 +1084,7 @@ copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) exchanged between TO and FROM. Pointers must be exchanged to avoid a memory leak. */ -static inline void +static void assign_row (struct glyph_row *to, struct glyph_row *from) { swap_glyph_pointers (to, from); @@ -1249,7 +1249,7 @@ line_draw_cost (struct glyph_matrix *matrix, int vpos) /* Return true if the glyph rows A and B have equal contents. MOUSE_FACE_P means compare the mouse_face_p flags of A and B, too. */ -static inline bool +static bool row_equal_p (struct glyph_row *a, struct glyph_row *b, bool mouse_face_p) { eassert (verify_row_hash (a)); @@ -2657,7 +2657,7 @@ fill_up_frame_row_with_spaces (struct glyph_row *row, int upto) function must be called before updates to make explicit that we are working on frame matrices or not. */ -static inline void +static void set_frame_matrix_frame (struct frame *f) { frame_matrix_frame = f; @@ -2672,7 +2672,7 @@ set_frame_matrix_frame (struct frame *f) done in frame matrices, and that we have to perform analogous operations in window matrices of frame_matrix_frame. */ -static inline void +static void make_current (struct glyph_matrix *desired_matrix, struct glyph_matrix *current_matrix, int row) { struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); @@ -4158,7 +4158,7 @@ static struct run **runs; /* Add glyph row ROW to the scrolling hash table. */ -static inline struct row_entry * +static struct row_entry * add_row_entry (struct glyph_row *row) { struct row_entry *entry; diff --git a/src/eval.c b/src/eval.c index 561ba922482..4d200fbc2bd 100644 --- a/src/eval.c +++ b/src/eval.c @@ -119,13 +119,13 @@ static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args); /* Functions to set Lisp_Object slots of struct specbinding. */ -static inline void +static void set_specpdl_symbol (Lisp_Object symbol) { specpdl_ptr->symbol = symbol; } -static inline void +static void set_specpdl_old_value (Lisp_Object oldval) { specpdl_ptr->old_value = oldval; diff --git a/src/fns.c b/src/fns.c index 6d6f019b311..d789bbd809b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3695,7 +3695,7 @@ copy_hash_table (struct Lisp_Hash_Table *h1) /* Resize hash table H if it's too full. If H cannot be resized because it's already too large, throw an error. */ -static inline void +static void maybe_resize_hash_table (struct Lisp_Hash_Table *h) { if (NILP (h->next_free)) diff --git a/src/frame.c b/src/frame.c index 0a127740980..edb90038a48 100644 --- a/src/frame.c +++ b/src/frame.c @@ -120,12 +120,12 @@ static void x_report_frame_params (struct frame *, Lisp_Object *); #endif /* These setters are used only in this file, so they can be private. */ -static inline void +static void fset_buffer_predicate (struct frame *f, Lisp_Object val) { f->buffer_predicate = val; } -static inline void +static void fset_minibuffer_window (struct frame *f, Lisp_Object val) { f->minibuffer_window = val; diff --git a/src/gmalloc.c b/src/gmalloc.c index 9eb9610ab23..dc584955661 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -464,7 +464,7 @@ get_contiguous_space (ptrdiff_t size, void *position) /* This is called when `_heapinfo' and `heapsize' have just been set to describe a new info table. Set up the table to describe itself and account for it in the statistics. */ -static inline void +static void register_heapinfo (void) { size_t block, blocks; diff --git a/src/intervals.c b/src/intervals.c index 584ee1e923d..1ed93e1302d 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -64,7 +64,7 @@ static INTERVAL reproduce_tree (INTERVAL, INTERVAL); /* Use these functions to set Lisp_Object or pointer slots of struct interval. */ -static inline void +static void set_interval_object (INTERVAL i, Lisp_Object obj) { eassert (BUFFERP (obj) || STRINGP (obj)); @@ -72,13 +72,13 @@ set_interval_object (INTERVAL i, Lisp_Object obj) i->up.obj = obj; } -static inline void +static void set_interval_left (INTERVAL i, INTERVAL left) { i->left = left; } -static inline void +static void set_interval_right (INTERVAL i, INTERVAL right) { i->right = right; @@ -87,7 +87,7 @@ set_interval_right (INTERVAL i, INTERVAL right) /* Make the parent of D be whatever the parent of S is, regardless of the type. This is used when balancing an interval tree. */ -static inline void +static void copy_interval_parent (INTERVAL d, INTERVAL s) { d->up = s->up; @@ -341,7 +341,7 @@ root_interval (INTERVAL interval) c c */ -static inline INTERVAL +static INTERVAL rotate_right (INTERVAL interval) { INTERVAL i; @@ -388,7 +388,7 @@ rotate_right (INTERVAL interval) c c */ -static inline INTERVAL +static INTERVAL rotate_left (INTERVAL interval) { INTERVAL i; @@ -466,7 +466,7 @@ balance_an_interval (INTERVAL i) /* Balance INTERVAL, potentially stuffing it back into its parent Lisp Object. */ -static inline INTERVAL +static INTERVAL balance_possible_root_interval (INTERVAL interval) { Lisp_Object parent; diff --git a/src/keyboard.c b/src/keyboard.c index f3d7df5e98f..10dca010fb5 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -448,47 +448,47 @@ static char *find_user_signal_name (int); static void store_user_signal_events (void); /* These setters are used only in this file, so they can be private. */ -static inline void +static void kset_echo_string (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (echo_string) = val; } -static inline void +static void kset_kbd_queue (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (kbd_queue) = val; } -static inline void +static void kset_keyboard_translate_table (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vkeyboard_translate_table) = val; } -static inline void +static void kset_last_prefix_arg (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vlast_prefix_arg) = val; } -static inline void +static void kset_last_repeatable_command (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vlast_repeatable_command) = val; } -static inline void +static void kset_local_function_key_map (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vlocal_function_key_map) = val; } -static inline void +static void kset_overriding_terminal_local_map (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Voverriding_terminal_local_map) = val; } -static inline void +static void kset_real_last_command (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (Vreal_last_command) = val; } -static inline void +static void kset_system_key_syms (struct kboard *kb, Lisp_Object val) { kb->INTERNAL_FIELD (system_key_syms) = val; @@ -3749,7 +3749,7 @@ kbd_buffer_events_waiting (int discard) /* Clear input event EVENT. */ -static inline void +static void clear_event (struct input_event *event) { event->kind = NO_EVENT; @@ -8054,7 +8054,7 @@ process_tool_bar_item (Lisp_Object key, Lisp_Object def, Lisp_Object data, void /* Access slot with index IDX of vector tool_bar_item_properties. */ #define PROP(IDX) AREF (tool_bar_item_properties, (IDX)) -static inline void +static void set_prop (ptrdiff_t idx, Lisp_Object val) { ASET (tool_bar_item_properties, idx, val); diff --git a/src/lread.c b/src/lread.c index d22011be7c8..581332502ed 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2283,7 +2283,7 @@ read_escape (Lisp_Object readcharfun, int stringp) /* Return the digit that CHARACTER stands for in the given BASE. Return -1 if CHARACTER is out of range for BASE, and -2 if CHARACTER is not valid for any supported BASE. */ -static inline int +static int digit_to_number (int character, int base) { int digit; diff --git a/src/marker.c b/src/marker.c index 0c4e8cb3b55..e01647bdb2a 100644 --- a/src/marker.c +++ b/src/marker.c @@ -427,7 +427,7 @@ Returns nil if MARKER points nowhere. */) /* Change M so it points to B at CHARPOS and BYTEPOS. */ -static inline void +static void attach_marker (struct Lisp_Marker *m, struct buffer *b, ptrdiff_t charpos, ptrdiff_t bytepos) { @@ -454,7 +454,7 @@ attach_marker (struct Lisp_Marker *m, struct buffer *b, whether BUFFER is a buffer object and return buffer pointer corresponding to BUFFER if BUFFER is live, or NULL otherwise. */ -static inline struct buffer * +static struct buffer * live_buffer (Lisp_Object buffer) { struct buffer *b; @@ -477,7 +477,7 @@ live_buffer (Lisp_Object buffer) /* Internal function to set MARKER in BUFFER at POSITION. Non-zero RESTRICTED means limit the POSITION by the visible part of BUFFER. */ -static inline Lisp_Object +static Lisp_Object set_marker_internal (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer, int restricted) { diff --git a/src/nsterm.m b/src/nsterm.m index d41c38f4e40..24a2129d1c3 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2171,7 +2171,7 @@ ns_shift_glyphs_for_insert (struct frame *f, ========================================================================== */ -static inline void +static void ns_compute_glyph_string_overhangs (struct glyph_string *s) /* -------------------------------------------------------------------------- External (RIF); compute left/right overhang of whole string and set in s diff --git a/src/process.c b/src/process.c index ab215766c07..dfc89809fa5 100644 --- a/src/process.c +++ b/src/process.c @@ -335,82 +335,82 @@ static struct sockaddr_and_len { static int pty_max_bytes; /* These setters are used only in this file, so they can be private. */ -static inline void +static void pset_buffer (struct Lisp_Process *p, Lisp_Object val) { p->buffer = val; } -static inline void +static void pset_command (struct Lisp_Process *p, Lisp_Object val) { p->command = val; } -static inline void +static void pset_decode_coding_system (struct Lisp_Process *p, Lisp_Object val) { p->decode_coding_system = val; } -static inline void +static void pset_decoding_buf (struct Lisp_Process *p, Lisp_Object val) { p->decoding_buf = val; } -static inline void +static void pset_encode_coding_system (struct Lisp_Process *p, Lisp_Object val) { p->encode_coding_system = val; } -static inline void +static void pset_encoding_buf (struct Lisp_Process *p, Lisp_Object val) { p->encoding_buf = val; } -static inline void +static void pset_filter (struct Lisp_Process *p, Lisp_Object val) { p->filter = val; } -static inline void +static void pset_log (struct Lisp_Process *p, Lisp_Object val) { p->log = val; } -static inline void +static void pset_mark (struct Lisp_Process *p, Lisp_Object val) { p->mark = val; } -static inline void +static void pset_name (struct Lisp_Process *p, Lisp_Object val) { p->name = val; } -static inline void +static void pset_plist (struct Lisp_Process *p, Lisp_Object val) { p->plist = val; } -static inline void +static void pset_sentinel (struct Lisp_Process *p, Lisp_Object val) { p->sentinel = val; } -static inline void +static void pset_status (struct Lisp_Process *p, Lisp_Object val) { p->status = val; } -static inline void +static void pset_tty_name (struct Lisp_Process *p, Lisp_Object val) { p->tty_name = val; } -static inline void +static void pset_type (struct Lisp_Process *p, Lisp_Object val) { p->type = val; } -static inline void +static void pset_write_queue (struct Lisp_Process *p, Lisp_Object val) { p->write_queue = val; diff --git a/src/syntax.c b/src/syntax.c index 91ef4e66663..d3cafcc472e 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -151,7 +151,7 @@ static void scan_sexps_forward (struct lisp_parse_state *, static int in_classes (int, Lisp_Object); /* This setter is used only in this file, so it can be private. */ -static inline void +static void bset_syntax_table (struct buffer *b, Lisp_Object val) { b->INTERNAL_FIELD (syntax_table) = val; @@ -372,7 +372,7 @@ char_quoted (ptrdiff_t charpos, ptrdiff_t bytepos) /* Return the bytepos one character before BYTEPOS. We assume that BYTEPOS is not at the start of the buffer. */ -static inline ptrdiff_t +static ptrdiff_t dec_bytepos (ptrdiff_t bytepos) { if (NILP (BVAR (current_buffer, enable_multibyte_characters))) diff --git a/src/terminal.c b/src/terminal.c index 719c2a36111..2c0c60e7345 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -42,7 +42,7 @@ struct terminal *initial_terminal; static void delete_initial_terminal (struct terminal *); /* This setter is used only in this file, so it can be private. */ -static inline void +static void tset_param_alist (struct terminal *t, Lisp_Object val) { t->param_alist = val; diff --git a/src/textprop.c b/src/textprop.c index 872912ea706..379eafb73f7 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -241,7 +241,7 @@ interval_has_all_properties (Lisp_Object plist, INTERVAL i) /* Return nonzero if the plist of interval I has any of the properties of PLIST, regardless of their values. */ -static inline int +static int interval_has_some_properties (Lisp_Object plist, INTERVAL i) { register Lisp_Object tail1, tail2, sym; @@ -263,7 +263,7 @@ interval_has_some_properties (Lisp_Object plist, INTERVAL i) /* Return nonzero if the plist of interval I has any of the property names in LIST, regardless of their values. */ -static inline int +static int interval_has_some_properties_list (Lisp_Object list, INTERVAL i) { register Lisp_Object tail1, tail2, sym; diff --git a/src/window.c b/src/window.c index bb3b73f9acd..3b974616e38 100644 --- a/src/window.c +++ b/src/window.c @@ -133,102 +133,102 @@ static EMACS_INT window_scroll_preserve_hpos; static EMACS_INT window_scroll_preserve_vpos; /* These setters are used only in this file, so they can be private. */ -static inline void +static void wset_combination_limit (struct window *w, Lisp_Object val) { w->combination_limit = val; } -static inline void +static void wset_dedicated (struct window *w, Lisp_Object val) { w->dedicated = val; } -static inline void +static void wset_display_table (struct window *w, Lisp_Object val) { w->display_table = val; } -static inline void +static void wset_hchild (struct window *w, Lisp_Object val) { w->hchild = val; } -static inline void +static void wset_left_fringe_width (struct window *w, Lisp_Object val) { w->left_fringe_width = val; } -static inline void +static void wset_left_margin_cols (struct window *w, Lisp_Object val) { w->left_margin_cols = val; } -static inline void +static void wset_new_normal (struct window *w, Lisp_Object val) { w->new_normal = val; } -static inline void +static void wset_new_total (struct window *w, Lisp_Object val) { w->new_total = val; } -static inline void +static void wset_normal_cols (struct window *w, Lisp_Object val) { w->normal_cols = val; } -static inline void +static void wset_normal_lines (struct window *w, Lisp_Object val) { w->normal_lines = val; } -static inline void +static void wset_parent (struct window *w, Lisp_Object val) { w->parent = val; } -static inline void +static void wset_pointm (struct window *w, Lisp_Object val) { w->pointm = val; } -static inline void +static void wset_right_fringe_width (struct window *w, Lisp_Object val) { w->right_fringe_width = val; } -static inline void +static void wset_right_margin_cols (struct window *w, Lisp_Object val) { w->right_margin_cols = val; } -static inline void +static void wset_scroll_bar_width (struct window *w, Lisp_Object val) { w->scroll_bar_width = val; } -static inline void +static void wset_start (struct window *w, Lisp_Object val) { w->start = val; } -static inline void +static void wset_temslot (struct window *w, Lisp_Object val) { w->temslot = val; } -static inline void +static void wset_vchild (struct window *w, Lisp_Object val) { w->vchild = val; } -static inline void +static void wset_vertical_scroll_bar_type (struct window *w, Lisp_Object val) { w->vertical_scroll_bar_type = val; } -static inline void +static void wset_window_parameters (struct window *w, Lisp_Object val) { w->window_parameters = val; diff --git a/src/xdisp.c b/src/xdisp.c index 1d267bd7ded..cdb9fd4e3b5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -367,22 +367,22 @@ static Lisp_Object Qmargin, Qpointer; static Lisp_Object Qline_height; /* These setters are used only in this file, so they can be private. */ -static inline void +static void wset_base_line_number (struct window *w, Lisp_Object val) { w->base_line_number = val; } -static inline void +static void wset_base_line_pos (struct window *w, Lisp_Object val) { w->base_line_pos = val; } -static inline void +static void wset_column_number_displayed (struct window *w, Lisp_Object val) { w->column_number_displayed = val; } -static inline void +static void wset_region_showing (struct window *w, Lisp_Object val) { w->region_showing = val; @@ -1191,7 +1191,7 @@ window_box (struct window *w, int area, int *box_x, int *box_y, *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the box. */ -static inline void +static void window_box_edges (struct window *w, int area, int *top_left_x, int *top_left_y, int *bottom_right_x, int *bottom_right_y) { @@ -1278,7 +1278,7 @@ string_from_display_spec (Lisp_Object spec) /* Limit insanely large values of W->hscroll on frame F to the largest value that will still prevent first_visible_x and last_visible_x of 'struct it' from overflowing an int. */ -static inline int +static int window_hscroll_limited (struct window *w, struct frame *f) { ptrdiff_t window_hscroll = w->hscroll; @@ -1625,7 +1625,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, returns an invalid character. If we find one, we return a `?', but with the length of the invalid character. */ -static inline int +static int string_char_and_length (const unsigned char *str, int *len) { int c; @@ -1673,7 +1673,7 @@ string_pos_nchars_ahead (struct text_pos pos, Lisp_Object string, ptrdiff_t ncha /* Value is the text position, i.e. character and byte position, for character position CHARPOS in STRING. */ -static inline struct text_pos +static struct text_pos string_pos (ptrdiff_t charpos, Lisp_Object string) { struct text_pos pos; @@ -12577,7 +12577,7 @@ debug_method_add (struct window *w, char const *fmt, ...) buffer position, END is given as a distance from Z. Used in redisplay_internal for display optimization. */ -static inline int +static int text_outside_line_unchanged_p (struct window *w, ptrdiff_t start, ptrdiff_t end) { @@ -12838,7 +12838,7 @@ check_point_in_composition (struct buffer *prev_buf, ptrdiff_t prev_pt, /* Reconsider the setting of B->clip_changed which is displayed in window W. */ -static inline void +static void reconsider_clip_changes (struct window *w, struct buffer *b) { if (b->clip_changed @@ -14538,7 +14538,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row, We assume that the window's buffer is really current. */ -static inline struct text_pos +static struct text_pos run_window_scroll_functions (Lisp_Object window, struct text_pos startp) { struct window *w = XWINDOW (window); @@ -22491,7 +22491,7 @@ init_glyph_string (struct glyph_string *s, /* Append the list of glyph strings with head H and tail T to the list with head *HEAD and tail *TAIL. Set *HEAD and *TAIL to the result. */ -static inline void +static void append_glyph_string_lists (struct glyph_string **head, struct glyph_string **tail, struct glyph_string *h, struct glyph_string *t) { @@ -22511,7 +22511,7 @@ append_glyph_string_lists (struct glyph_string **head, struct glyph_string **tai list with head *HEAD and tail *TAIL. Set *HEAD and *TAIL to the result. */ -static inline void +static void prepend_glyph_string_lists (struct glyph_string **head, struct glyph_string **tail, struct glyph_string *h, struct glyph_string *t) { @@ -22530,7 +22530,7 @@ prepend_glyph_string_lists (struct glyph_string **head, struct glyph_string **ta /* Append glyph string S to the list with head *HEAD and tail *TAIL. Set *HEAD and *TAIL to the resulting list. */ -static inline void +static void append_glyph_string (struct glyph_string **head, struct glyph_string **tail, struct glyph_string *s) { @@ -22545,7 +22545,7 @@ append_glyph_string (struct glyph_string **head, struct glyph_string **tail, Value is a pointer to a realized face that is ready for display if DISPLAY_P is non-zero. */ -static inline struct face * +static struct face * get_char_face_and_encoding (struct frame *f, int c, int face_id, XChar2b *char2b, int display_p) { @@ -22578,7 +22578,7 @@ get_char_face_and_encoding (struct frame *f, int c, int face_id, The encoding of GLYPH->u.ch is returned in *CHAR2B. Value is a pointer to a realized face that is ready for display. */ -static inline struct face * +static struct face * get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph, XChar2b *char2b, int *two_byte_p) { @@ -22615,7 +22615,7 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph, /* Get glyph code of character C in FONT in the two-byte form CHAR2B. Return 1 if FONT has a glyph for C, otherwise return 0. */ -static inline int +static int get_char_glyph_code (int c, struct font *font, XChar2b *char2b) { unsigned code; @@ -23089,7 +23089,7 @@ right_overwriting (struct glyph_string *s) first glyph following S. LAST_X is the right-most x-position + 1 in the drawing area. */ -static inline void +static void set_glyph_string_background_width (struct glyph_string *s, int start, int last_x) { /* If the face of this glyph string has to be drawn to the end of @@ -23650,7 +23650,7 @@ draw_glyphs (struct window *w, int x, struct glyph_row *row, /* Store one glyph for IT->char_to_display in IT->glyph_row. Called from x_produce_glyphs when IT->glyph_row is non-null. */ -static inline void +static void append_glyph (struct it *it) { struct glyph *glyph; @@ -23724,7 +23724,7 @@ append_glyph (struct it *it) IT->glyph_row. Called from x_produce_glyphs when IT->glyph_row is non-null. */ -static inline void +static void append_composite_glyph (struct it *it) { struct glyph *glyph; @@ -23793,7 +23793,7 @@ append_composite_glyph (struct it *it) /* Change IT->ascent and IT->height according to the setting of IT->voffset. */ -static inline void +static void take_vertical_position_into_account (struct it *it) { if (it->voffset) diff --git a/src/xfaces.c b/src/xfaces.c index 28be6aaf082..f861dde2d15 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -601,7 +601,7 @@ x_free_dpy_colors (Display *dpy, Screen *screen, Colormap cmap, /* Create and return a GC for use on frame F. GC values and mask are given by XGCV and MASK. */ -static inline GC +static GC x_create_gc (struct frame *f, long unsigned int mask, XGCValues *xgcv) { GC gc; @@ -615,7 +615,7 @@ x_create_gc (struct frame *f, long unsigned int mask, XGCValues *xgcv) /* Free GC which was used on frame F. */ -static inline void +static void x_free_gc (struct frame *f, GC gc) { eassert (input_blocked_p ()); @@ -628,7 +628,7 @@ x_free_gc (struct frame *f, GC gc) #ifdef WINDOWSNT /* W32 emulation of GCs */ -static inline GC +static GC x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv) { GC gc; @@ -642,7 +642,7 @@ x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv) /* Free GC which was used on frame F. */ -static inline void +static void x_free_gc (struct frame *f, GC gc) { IF_DEBUG (eassert (--ngcs >= 0)); @@ -654,7 +654,7 @@ x_free_gc (struct frame *f, GC gc) #ifdef HAVE_NS /* NS emulation of GCs */ -static inline GC +static GC x_create_gc (struct frame *f, unsigned long mask, XGCValues *xgcv) @@ -664,7 +664,7 @@ x_create_gc (struct frame *f, return gc; } -static inline void +static void x_free_gc (struct frame *f, GC gc) { xfree (gc); @@ -677,7 +677,7 @@ x_free_gc (struct frame *f, GC gc) CHECK_LIVE_FRAME. This is here because it's a frequent pattern in Lisp function definitions. */ -static inline struct frame * +static struct frame * frame_or_selected_frame (Lisp_Object frame, int nparam) { if (NILP (frame)) @@ -1920,7 +1920,7 @@ struct named_merge_point FACE_NAME and NAMED_MERGE_POINT_KIND, as the head of the linked list pointed to by NAMED_MERGE_POINTS, and return 1. */ -static inline int +static int push_named_merge_point (struct named_merge_point *new_named_merge_point, Lisp_Object face_name, enum named_merge_point_kind named_merge_point_kind, @@ -2004,7 +2004,7 @@ resolve_face_name (Lisp_Object face_name, int signal_p) face text properties; Ediff uses that). If SIGNAL_P is non-zero, signal an error if FACE_NAME is not a valid face name. If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face name. */ -static inline Lisp_Object +static Lisp_Object lface_from_face_name_no_resolve (struct frame *f, Lisp_Object face_name, int signal_p) { @@ -2033,7 +2033,7 @@ lface_from_face_name_no_resolve (struct frame *f, Lisp_Object face_name, non-zero, signal an error if FACE_NAME is not a valid face name. If SIGNAL_P is zero, value is nil if FACE_NAME is not a valid face name. */ -static inline Lisp_Object +static Lisp_Object lface_from_face_name (struct frame *f, Lisp_Object face_name, int signal_p) { face_name = resolve_face_name (face_name, signal_p); @@ -2047,7 +2047,7 @@ lface_from_face_name (struct frame *f, Lisp_Object face_name, int signal_p) is non-zero, signal an error if FACE_NAME does not name a face. Otherwise, value is zero if FACE_NAME is not a face. */ -static inline int +static int get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p) { @@ -2069,7 +2069,7 @@ get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name, non-zero, signal an error if FACE_NAME does not name a face. Otherwise, value is zero if FACE_NAME is not a face. */ -static inline int +static int get_lface_attributes (struct frame *f, Lisp_Object face_name, Lisp_Object *attrs, int signal_p, struct named_merge_point *named_merge_points) @@ -2234,7 +2234,7 @@ merge_face_heights (Lisp_Object from, Lisp_Object to, Lisp_Object invalid) loops in face inheritance/remapping; it should be 0 when called from other places. */ -static inline void +static void merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to, struct named_merge_point *named_merge_points) { @@ -3906,7 +3906,7 @@ return the font name used for CHARACTER. */) all attributes are `equal'. Tries to be fast because this function is called quite often. */ -static inline int +static int face_attr_equal_p (Lisp_Object v1, Lisp_Object v2) { /* Type can differ, e.g. when one attribute is unspecified, i.e. nil, @@ -3939,7 +3939,7 @@ face_attr_equal_p (Lisp_Object v1, Lisp_Object v2) all attributes are `equal'. Tries to be fast because this function is called quite often. */ -static inline int +static int lface_equal_p (Lisp_Object *v1, Lisp_Object *v2) { int i, equal_p = 1; @@ -4024,7 +4024,7 @@ For internal use only. */) /* Return a hash code for Lisp string STRING with case ignored. Used below in computing a hash value for a Lisp face. */ -static inline unsigned +static unsigned hash_string_case_insensitive (Lisp_Object string) { const unsigned char *s; @@ -4038,7 +4038,7 @@ hash_string_case_insensitive (Lisp_Object string) /* Return a hash code for face attribute vector V. */ -static inline unsigned +static unsigned lface_hash (Lisp_Object *v) { return (hash_string_case_insensitive (v[LFACE_FAMILY_INDEX]) @@ -4057,7 +4057,7 @@ lface_hash (Lisp_Object *v) family, point size, weight, width, slant, and font. Both LFACE1 and LFACE2 must be fully-specified. */ -static inline int +static int lface_same_font_attributes_p (Lisp_Object *lface1, Lisp_Object *lface2) { eassert (lface_fully_specified_p (lface1) @@ -4453,7 +4453,7 @@ uncache_face (struct face_cache *c, struct face *face) Value is the ID of the face found. If no suitable face is found, realize a new one. */ -static inline int +static int lookup_face (struct frame *f, Lisp_Object *attr) { struct face_cache *cache = FRAME_FACE_CACHE (f); diff --git a/src/xml.c b/src/xml.c index a22ca208743..a0c4fe17fc4 100644 --- a/src/xml.c +++ b/src/xml.c @@ -73,7 +73,7 @@ libxml2_loaded_p (void) #define fn_xmlCleanupParser xmlCleanupParser #define fn_xmlCheckVersion xmlCheckVersion -static inline int +static int libxml2_loaded_p (void) { return 1; diff --git a/src/xterm.c b/src/xterm.c index 6cd1d583870..a4c3e125d8d 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1027,7 +1027,7 @@ x_set_mouse_face_gc (struct glyph_string *s) Faces to use in the mode line have already been computed when the matrix was built, so there isn't much to do, here. */ -static inline void +static void x_set_mode_line_face_gc (struct glyph_string *s) { s->gc = s->face->gc; @@ -1038,7 +1038,7 @@ x_set_mode_line_face_gc (struct glyph_string *s) S->stippled_p to a non-zero value if the face of S has a stipple pattern. */ -static inline void +static void x_set_glyph_string_gc (struct glyph_string *s) { PREPARE_FACE_FOR_DISPLAY (s->f, s->face); @@ -1083,7 +1083,7 @@ x_set_glyph_string_gc (struct glyph_string *s) /* Set clipping for output of glyph string S. S may be part of a mode line or menu if we don't have X toolkit support. */ -static inline void +static void x_set_glyph_string_clipping (struct glyph_string *s) { XRectangle *r = s->clip; @@ -1156,7 +1156,7 @@ x_compute_glyph_string_overhangs (struct glyph_string *s) /* Fill rectangle X, Y, W, H with background color of glyph string S. */ -static inline void +static void x_clear_glyph_string_rect (struct glyph_string *s, int x, int y, int w, int h) { XGCValues xgcv; |