diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-20 10:31:24 +0200 |
commit | 61b8d44f1f76df5abb9e53427f07e9f1ad987e32 (patch) | |
tree | f0f84ebfb28ec44254def01211eeca94c76aeed4 /nx-X11/lib/X11/XlibInt.c | |
parent | da01dc8da1aedb1f75d62c03748a239c54b14483 (diff) | |
parent | 50eb5e4a9bf812895a7d5c4e6ae0775c6910931f (diff) | |
download | nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.gz nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.tar.bz2 nx-libs-61b8d44f1f76df5abb9e53427f07e9f1ad987e32.zip |
Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.x
Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
Diffstat (limited to 'nx-X11/lib/X11/XlibInt.c')
-rw-r--r-- | nx-X11/lib/X11/XlibInt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index d3c85a343..42b928fd5 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -874,7 +874,7 @@ void _XSeqSyncFunction( register Display *dpy) { xGetInputFocusReply rep; - register xReq *req; + _X_UNUSED register xReq *req; #ifdef NX_TRANS_SOCKET #ifdef NX_TRANS_DEBUG @@ -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 |