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.h | |
| 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.h')
| -rw-r--r-- | nx-X11/lib/X11/Xlibint.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ ); |