aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorPaul Eggert2012-09-30 23:36:54 -0700
committerPaul Eggert2012-09-30 23:36:54 -0700
commitb0ab8123df78b7149d1f55b2ef0d3095c3f10628 (patch)
tree14d324cb46348dbf9a4568c7050d2776259c5358 /src/window.c
parent05584c31090df82f831f2998939fd423f036e86d (diff)
downloademacs-b0ab8123df78b7149d1f55b2ef0d3095c3f10628.tar.gz
emacs-b0ab8123df78b7149d1f55b2ef0d3095c3f10628.zip
Prefer plain 'static' to 'static inline'.
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'. Fixes: debbugs:12541
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c40
1 files changed, 20 insertions, 20 deletions
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;
133static EMACS_INT window_scroll_preserve_vpos; 133static EMACS_INT window_scroll_preserve_vpos;
134 134
135/* These setters are used only in this file, so they can be private. */ 135/* These setters are used only in this file, so they can be private. */
136static inline void 136static void
137wset_combination_limit (struct window *w, Lisp_Object val) 137wset_combination_limit (struct window *w, Lisp_Object val)
138{ 138{
139 w->combination_limit = val; 139 w->combination_limit = val;
140} 140}
141static inline void 141static void
142wset_dedicated (struct window *w, Lisp_Object val) 142wset_dedicated (struct window *w, Lisp_Object val)
143{ 143{
144 w->dedicated = val; 144 w->dedicated = val;
145} 145}
146static inline void 146static void
147wset_display_table (struct window *w, Lisp_Object val) 147wset_display_table (struct window *w, Lisp_Object val)
148{ 148{
149 w->display_table = val; 149 w->display_table = val;
150} 150}
151static inline void 151static void
152wset_hchild (struct window *w, Lisp_Object val) 152wset_hchild (struct window *w, Lisp_Object val)
153{ 153{
154 w->hchild = val; 154 w->hchild = val;
155} 155}
156static inline void 156static void
157wset_left_fringe_width (struct window *w, Lisp_Object val) 157wset_left_fringe_width (struct window *w, Lisp_Object val)
158{ 158{
159 w->left_fringe_width = val; 159 w->left_fringe_width = val;
160} 160}
161static inline void 161static void
162wset_left_margin_cols (struct window *w, Lisp_Object val) 162wset_left_margin_cols (struct window *w, Lisp_Object val)
163{ 163{
164 w->left_margin_cols = val; 164 w->left_margin_cols = val;
165} 165}
166static inline void 166static void
167wset_new_normal (struct window *w, Lisp_Object val) 167wset_new_normal (struct window *w, Lisp_Object val)
168{ 168{
169 w->new_normal = val; 169 w->new_normal = val;
170} 170}
171static inline void 171static void
172wset_new_total (struct window *w, Lisp_Object val) 172wset_new_total (struct window *w, Lisp_Object val)
173{ 173{
174 w->new_total = val; 174 w->new_total = val;
175} 175}
176static inline void 176static void
177wset_normal_cols (struct window *w, Lisp_Object val) 177wset_normal_cols (struct window *w, Lisp_Object val)
178{ 178{
179 w->normal_cols = val; 179 w->normal_cols = val;
180} 180}
181static inline void 181static void
182wset_normal_lines (struct window *w, Lisp_Object val) 182wset_normal_lines (struct window *w, Lisp_Object val)
183{ 183{
184 w->normal_lines = val; 184 w->normal_lines = val;
185} 185}
186static inline void 186static void
187wset_parent (struct window *w, Lisp_Object val) 187wset_parent (struct window *w, Lisp_Object val)
188{ 188{
189 w->parent = val; 189 w->parent = val;
190} 190}
191static inline void 191static void
192wset_pointm (struct window *w, Lisp_Object val) 192wset_pointm (struct window *w, Lisp_Object val)
193{ 193{
194 w->pointm = val; 194 w->pointm = val;
195} 195}
196static inline void 196static void
197wset_right_fringe_width (struct window *w, Lisp_Object val) 197wset_right_fringe_width (struct window *w, Lisp_Object val)
198{ 198{
199 w->right_fringe_width = val; 199 w->right_fringe_width = val;
200} 200}
201static inline void 201static void
202wset_right_margin_cols (struct window *w, Lisp_Object val) 202wset_right_margin_cols (struct window *w, Lisp_Object val)
203{ 203{
204 w->right_margin_cols = val; 204 w->right_margin_cols = val;
205} 205}
206static inline void 206static void
207wset_scroll_bar_width (struct window *w, Lisp_Object val) 207wset_scroll_bar_width (struct window *w, Lisp_Object val)
208{ 208{
209 w->scroll_bar_width = val; 209 w->scroll_bar_width = val;
210} 210}
211static inline void 211static void
212wset_start (struct window *w, Lisp_Object val) 212wset_start (struct window *w, Lisp_Object val)
213{ 213{
214 w->start = val; 214 w->start = val;
215} 215}
216static inline void 216static void
217wset_temslot (struct window *w, Lisp_Object val) 217wset_temslot (struct window *w, Lisp_Object val)
218{ 218{
219 w->temslot = val; 219 w->temslot = val;
220} 220}
221static inline void 221static void
222wset_vchild (struct window *w, Lisp_Object val) 222wset_vchild (struct window *w, Lisp_Object val)
223{ 223{
224 w->vchild = val; 224 w->vchild = val;
225} 225}
226static inline void 226static void
227wset_vertical_scroll_bar_type (struct window *w, Lisp_Object val) 227wset_vertical_scroll_bar_type (struct window *w, Lisp_Object val)
228{ 228{
229 w->vertical_scroll_bar_type = val; 229 w->vertical_scroll_bar_type = val;
230} 230}
231static inline void 231static void
232wset_window_parameters (struct window *w, Lisp_Object val) 232wset_window_parameters (struct window *w, Lisp_Object val)
233{ 233{
234 w->window_parameters = val; 234 w->window_parameters = val;