aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/ClDisplay.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-07-29 00:44:38 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-08-24 23:05:45 +0200
commitacfe0013c9d1ef1344c7813d4dae51ba6f2da622 (patch)
treeba17af85081b346a6b0e753fd9ac1e590a4ca494 /nx-X11/lib/X11/ClDisplay.c
parent35145c251305a562c4273d712fab5b4b387913ab (diff)
downloadnx-libs-acfe0013c9d1ef1344c7813d4dae51ba6f2da622.tar.gz
nx-libs-acfe0013c9d1ef1344c7813d4dae51ba6f2da622.tar.bz2
nx-libs-acfe0013c9d1ef1344c7813d4dae51ba6f2da622.zip
update src files *[ch] to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/ClDisplay.c')
-rw-r--r--nx-X11/lib/X11/ClDisplay.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/nx-X11/lib/X11/ClDisplay.c b/nx-X11/lib/X11/ClDisplay.c
index 48625d673..898fc9144 100644
--- a/nx-X11/lib/X11/ClDisplay.c
+++ b/nx-X11/lib/X11/ClDisplay.c
@@ -30,12 +30,16 @@ from The Open Group.
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#if USE_XCB
+#include "Xxcbint.h"
+#else /* !USE_XCB */
#include <nx-X11/Xtrans/Xtrans.h>
+#endif /* USE_XCB */
#include "Xlib.h"
#include "Xlibint.h"
#include "Xintconn.h"
-/*
+/*
* XCloseDisplay - XSync the connection to the X Server, close the connection,
* and free all associated storage. Extension close procs should only free
* memory and must be careful about the types of requests they generate.
@@ -68,7 +72,11 @@ XCloseDisplay (
if (dpy->request != dpy->last_request_read)
XSync(dpy, 1);
}
+#if USE_XCB
+ xcb_disconnect(dpy->xcb->connection);
+#else /* !USE_XCB */
_XDisconnectDisplay(dpy->trans_conn);
+#endif /* USE_XCB */
_XFreeDisplayStructure (dpy);
return 0;
}