aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-16 02:15:13 +0200
committerUlrich Sibiller <u.sibiller@science-computing.de>2016-10-20 10:16:35 +0200
commit2c59fbe30b86854f32e80b84be18328a661e7707 (patch)
tree98560e84b592502d3d631c1ab91d18937fce2127
parent0a28292ec986070edccc8fc1eea4c3d3e280e102 (diff)
downloadnx-libs-2c59fbe30b86854f32e80b84be18328a661e7707.tar.gz
nx-libs-2c59fbe30b86854f32e80b84be18328a661e7707.tar.bz2
nx-libs-2c59fbe30b86854f32e80b84be18328a661e7707.zip
Fix warnings in XlibInt.c
XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: ‘noreturn’ function does return [enabled by default] } After fixing the above a new warning came up, which is also fixed now: XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: control reaches end of non-void function [-Wreturn-type] }
-rw-r--r--nx-X11/lib/X11/XlibInt.c2
-rw-r--r--nx-X11/lib/X11/Xlibint.h5
2 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c
index d3c85a343..851fa236e 100644
--- a/nx-X11/lib/X11/XlibInt.c
+++ b/nx-X11/lib/X11/XlibInt.c
@@ -3743,6 +3743,8 @@ _XIOError (
dpy->flags &= ~XlibDisplayReadEvents;
dpy->flags &= ~XlibDisplayWriting;
dpy->flags &= ~XlibDisplayReply;
+ /* shut up the compiler by returning something */
+ return 0;
#else
exit (1);
#endif
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index 056b4d8f9..932ed745e 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -856,7 +856,12 @@ extern int _XError(
);
extern int _XIOError(
Display* /* dpy */
+#ifdef NX_TRANS_SOCKET
+);
+#else
) _X_NORETURN;
+#endif /* NX_TRANS_SOCKET */
+
extern int (*_XIOErrorFunction)(
Display* /* dpy */
);