From 15bda1697070a1fe97b1706fa27ac49c2439b6cb Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Mon, 13 Jun 2016 17:11:57 -0400 Subject: [PATCH 1/7] =?UTF-8?q?Eliminate=20"noreturn"=20warnings=20if=20th?= =?UTF-8?q?ere=E2=80=99s=20no=20window=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/frame.c (decode_window_system_frame, check_window_system): Define new _Noreturn versions if !HAVE_WINDOW_SYSTEM. * src/frame.h: (decode_window_system_frame, check_window_system): Adjust prototypes. --- src/frame.c | 18 ++++++++++++++++-- src/frame.h | 6 ++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/frame.c b/src/frame.c index df97539..653d660 100644 --- a/src/frame.c +++ b/src/frame.c @@ -113,8 +113,6 @@ window_system_available (struct frame *f) return f ? FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f) : x_display_list != NULL; } -#endif /* HAVE_WINDOW_SYSTEM */ - struct frame * decode_window_system_frame (Lisp_Object frame) { @@ -133,6 +131,22 @@ check_window_system (struct frame *f) : "Window system is not in use or not initialized"); } +#else /* not HAVE_WINDOW_SYSTEM */ + +_Noreturn void +decode_window_system_frame (Lisp_Object frame) +{ + error ("Window system is not in use"); +} + +_Noreturn void +check_window_system (struct frame *f) +{ + error ("Window system is not in use"); +} + +#endif /* not HAVE_WINDOW_SYSTEM */ + /* Return the value of frame parameter PROP in frame FRAME. */ Lisp_Object diff --git a/src/frame.h b/src/frame.h index 7d64e00..0189ca1 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1102,12 +1102,13 @@ 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 *, @@ -1115,8 +1116,9 @@ extern struct frame *make_frame_without_minibuffer (Lisp_Object, extern bool window_system_available (struct frame *); #else /* not HAVE_WINDOW_SYSTEM */ #define window_system_available(f) ((void) (f), false) +extern _Noreturn void check_window_system (struct frame *); +extern _Noreturn void decode_window_system_frame (Lisp_Object); #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); -- 2.8.3