diff options
author | Ken Brown <kbrown@cornell.edu> | 2016-06-20 17:54:23 -0400 |
---|---|---|
committer | Ken Brown <kbrown@cornell.edu> | 2016-06-20 21:53:49 -0400 |
commit | d4c1535c6321318e3ba96a482303bfc790a47266 (patch) | |
tree | 5daf1c1c2c02aad33faeec63a6feae52dd0cc776 /src/frame.h | |
parent | 9eaec6859df69f0baac57f0801bfbf195ee88dc5 (diff) | |
download | emacs-d4c1535c6321318e3ba96a482303bfc790a47266.tar.gz |
Fix compiler warnings in no-window-system-build
* src/composite.c (autocmp_chars): Declare and set 'f' only if
HAVE_WINDOW_SYSTEM.
* src/dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P)
(FACE_FOR_CHAR): Explicitly discard unused arguments.
* src/font.c (font_open_entity): Declare 'min_width' where it is
first set, and only if HAVE_WINDOW_SYSTEM.
* src/frame.c [!HAVE_WINDOW_SYSTEM] (decode_window_system_frame):
Define _Noreturn version to avoid "suggest attribute noreturn"
compiler warning.
(check_window_system): Declare as _Noreturn.
(Ficonify_frame):
(Fset_frame_position): Don’t declare and set 'f'.
* src/frame.h [!HAVE_WINDOW_SYSTEM] (decode_window_system_frame)
(check_window_system): Add _Noreturn prototypes.
(FRAME_FRINGE_COLS, FRAME_TOTAL_FRINGE_WIDTH)
(FRAME_LEFT_FRINGE_WIDTH, FRAME_RIGHT_FRINGE_WIDTH)
(FRAME_INTERNAL_BORDER_WIDTH, FRAME_RIGHT_DIVIDER_WIDTH)
(FRAME_BOTTOM_DIVIDER_WIDTH): Explicitly discard unused argument.
* src/xdisp.c (handle_single_display_spec): Declare
'fringe_bitmap' only if HAVE_WINDOW_SYSTEM.
(append_space_for_newline): Declare 'g' where it is first set.
(Fmove_point_visually): Declare and set 'target_is_eol_p' only if
HAVE_WINDOW_SYSTEM.
(show_mouse_face): Declare and set 'f' and 'phys_cursor_on_p' only
if HAVE_WINDOW_SYSTEM.
(note_mode_line_or_margin_highlight):
(note_mouse_highlight): Declare and set 'cursor' and 'pointer'
only if HAVE_WINDOW_SYSTEM.
* src/xfaces.c (realize_default_face): Declare and set 'face' only
if HAVE_X_WINDOWS. Remove redundant #ifdef.
Diffstat (limited to 'src/frame.h')
-rw-r--r-- | src/frame.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/frame.h b/src/frame.h index 7d64e00b422..4ee0a7411f9 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1102,21 +1102,23 @@ extern Lisp_Object selected_frame; extern int frame_default_tool_bar_height; #endif -extern struct frame *decode_window_system_frame (Lisp_Object); extern struct frame *decode_live_frame (Lisp_Object); extern struct frame *decode_any_frame (Lisp_Object); extern struct frame *make_initial_frame (void); extern struct frame *make_frame (bool); #ifdef HAVE_WINDOW_SYSTEM +extern void check_window_system (struct frame *); +extern struct frame *decode_window_system_frame (Lisp_Object); extern struct frame *make_minibuffer_frame (void); extern struct frame *make_frame_without_minibuffer (Lisp_Object, struct kboard *, Lisp_Object); extern bool window_system_available (struct frame *); #else /* not HAVE_WINDOW_SYSTEM */ +extern _Noreturn void check_window_system (struct frame *); +extern _Noreturn void decode_window_system_frame (Lisp_Object); #define window_system_available(f) ((void) (f), false) #endif /* HAVE_WINDOW_SYSTEM */ -extern void check_window_system (struct frame *); extern void frame_make_pointer_invisible (struct frame *); extern void frame_make_pointer_visible (struct frame *); extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object); @@ -1181,13 +1183,13 @@ extern Lisp_Object Vframe_list; #else /* not HAVE_WINDOW_SYSTEM */ -#define FRAME_FRINGE_COLS(F) 0 -#define FRAME_TOTAL_FRINGE_WIDTH(F) 0 -#define FRAME_LEFT_FRINGE_WIDTH(F) 0 -#define FRAME_RIGHT_FRINGE_WIDTH(F) 0 -#define FRAME_INTERNAL_BORDER_WIDTH(F) 0 -#define FRAME_RIGHT_DIVIDER_WIDTH(F) 0 -#define FRAME_BOTTOM_DIVIDER_WIDTH(F) 0 +#define FRAME_FRINGE_COLS(F) ((void) (F), 0) +#define FRAME_TOTAL_FRINGE_WIDTH(F) ((void) (F), 0) +#define FRAME_LEFT_FRINGE_WIDTH(F) ((void) (F), 0) +#define FRAME_RIGHT_FRINGE_WIDTH(F) ((void) (F), 0) +#define FRAME_INTERNAL_BORDER_WIDTH(F) ((void) (F), 0) +#define FRAME_RIGHT_DIVIDER_WIDTH(F) ((void) (F), 0) +#define FRAME_BOTTOM_DIVIDER_WIDTH(F) ((void) (F), 0) #endif /* not HAVE_WINDOW_SYSTEM */ |