summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2015-05-09 13:13:32 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2015-05-09 13:13:32 -0700
commita415214bf282dcc8385f2101e6f8c018e188fa41 (patch)
tree663f68ceebfc6de5e64fa1459bc0a385cb262717
parenta6733f76dad52644bd45a8674bf0ea97c6e424ac (diff)
Fix -Wmissing-noreturn warnings
editres.c:140:1: warning: function 'Syntax' could be declared with attribute 'noreturn' [-Wmissing-noreturn] handler.c:65:1: warning: function 'Quit' could be declared with attribute 'noreturn' [-Wmissing-noreturn] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac2
-rw-r--r--editres.c2
-rw-r--r--editresP.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b34557b..5cff031 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Obtain compiler/linker options from depedencies
-PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu])
+PKG_CHECK_MODULES(EDITRES, [xaw7 x11 xt >= 1.0.99.1 xmu xproto >= 7.0.17])
PKG_CHECK_MODULES(APPDEFS, xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/editres.c b/editres.c
index e932807..ac435c2 100644
--- a/editres.c
+++ b/editres.c
@@ -61,7 +61,7 @@ Widget global_toplevel;
AppResources global_resources;
-static void Syntax ( XtAppContext app_con, char *call );
+static void Syntax ( XtAppContext app_con, char *call ) _X_NORETURN;
static String fallback_resources[] = {
NULL,
diff --git a/editresP.h b/editresP.h
index f6aa412..5413365 100644
--- a/editresP.h
+++ b/editresP.h
@@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xmu/EditresP.h>
#include <X11/Xresource.h>
+#include <X11/Xfuncproto.h>
#define DEBUG
@@ -403,7 +404,7 @@ extern void PrintNodes ( WNode * top );
extern char * PrintSetValuesError ( Event * event );
extern char * ProtocolFailure ( ProtocolStream * stream );
extern XrmQuarkList Quarkify ( char ** list, char * ptr );
-extern void Quit ( Widget w, XtPointer client_data, XtPointer call_data );
+extern void Quit ( Widget w, XtPointer client_data, XtPointer call_data ) _X_NORETURN;
extern void RebuildMenusAndLabel ( String toolkit );
extern void ResourceListCallback ( Widget list, XtPointer node_ptr, XtPointer junk );
extern void SaveResource ( Widget w, XtPointer res_box_ptr, XtPointer junk );