diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-06 13:12:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-06 13:12:10 -0800 |
| commit | cb41b32a2325b0bd6e12d62cc82f2bc6dd00047a (patch) | |
| tree | cac980e6ca70924145e6b79705a252c8e4f49a57 /src/dispextern.h | |
| parent | b70413668a72cbc36fba7d505131a71a847d602b (diff) | |
| download | emacs-cb41b32a2325b0bd6e12d62cc82f2bc6dd00047a.tar.gz emacs-cb41b32a2325b0bd6e12d62cc82f2bc6dd00047a.tar.bz2 emacs-cb41b32a2325b0bd6e12d62cc82f2bc6dd00047a.zip | |
Fix some portability problems with 'inline'.
* dispextern.h (window_box, window_box_height, window_text_bottom_y)
(window_box_width, window_box_left, window_box_left_offset)
(window_box_right, window_box_right_offset): Declare extern.
Otherwise, these inline functions do not conform to C99 and
are miscompiled by Microsoft compilers. Reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>.
* intervals.c (adjust_intervals_for_insertion)
(adjust_intervals_for_deletion): Now extern, because otherwise the
extern inline functions 'offset_intervals' couldn't refer to it.
(static_offset_intervals): Remove.
(offset_intervals): Rewrite using the old contents of
static_offset_intervals. The old version didn't conform to C99
because an extern inline function contained a reference to an
identifier with static linkage.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 5c60a5499da..fdc7f2f908d 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3006,14 +3006,14 @@ int resize_mini_window (struct window *, int); void set_vertical_scroll_bar (struct window *); #endif int try_window (Lisp_Object, struct text_pos, int); -void window_box (struct window *, int, int *, int *, int *, int *); -int window_box_height (struct window *); -int window_text_bottom_y (struct window *); -int window_box_width (struct window *, int); -int window_box_left (struct window *, int); -int window_box_left_offset (struct window *, int); -int window_box_right (struct window *, int); -int window_box_right_offset (struct window *, int); +extern void window_box (struct window *, int, int *, int *, int *, int *); +extern int window_box_height (struct window *); +extern int window_text_bottom_y (struct window *); +extern int window_box_width (struct window *, int); +extern int window_box_left (struct window *, int); +extern int window_box_left_offset (struct window *, int); +extern int window_box_right (struct window *, int); +extern int window_box_right_offset (struct window *, int); int estimate_mode_line_height (struct frame *, enum face_id); void pixel_to_glyph_coords (struct frame *, int, int, int *, int *, NativeRectangle *, int); |