diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/Xintconn.h | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/Xintconn.h')
| -rw-r--r-- | nx-X11/lib/X11/Xintconn.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/Xintconn.h b/nx-X11/lib/X11/Xintconn.h index 7f7ff485b..54200ed9f 100644 --- a/nx-X11/lib/X11/Xintconn.h +++ b/nx-X11/lib/X11/Xintconn.h @@ -6,6 +6,7 @@ _XFUNCPROTOBEGIN +#if !USE_XCB /* ConnDis.c */ int _XConnectDisplay ( @@ -26,6 +27,7 @@ extern XtransConnInfo _X11TransConnectDisplay(char *display_name, int *screenp, char **auth_namep, int *auth_namelenp, char **auth_datap, int *auth_datalenp); +#endif /* !USE_XCB */ /* OpenDis.c */ extern void _XFreeDisplayStructure(Display *dpy); |