Mark functions _X_NORETURN that gcc warnings suggest

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index adf3033..ce2e205 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ XORG_DEFAULT_OPTIONS
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt >= 1.0 x11)
+PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt >= 1.0 x11 xproto >= 7.0.17)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
 xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/xconsole.c b/xconsole.c
index 6e10403..4d9c8e7 100644
--- a/xconsole.c
+++ b/xconsole.c
@@ -30,6 +30,8 @@ in this Software without prior written authorization from The Open Group.
 #include "config.h"
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Xatom.h>
@@ -382,7 +384,7 @@ KillChild(int sig)
 #endif
 
 /*ARGSUSED*/
-static void
+static void _X_NORETURN
 Quit(Widget widget, XEvent *event, String *params, Cardinal *num_params)
 {
 #ifdef USE_OSM
@@ -634,7 +636,7 @@ ConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type,
     return False;
 }
 
-static void
+static void _X_NORETURN
 LoseSelection(Widget w, Atom *selection)
 {
     Quit (w, (XEvent*)NULL, (String*)NULL, (Cardinal*)NULL);