summaryrefslogtreecommitdiff
path: root/src/OpenDis.c
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2006-10-05 17:44:22 -0700
committerJosh Triplett <josh@freedesktop.org>2006-10-05 17:44:22 -0700
commite754b3b078d556c7861da56aad47d244e9199e06 (patch)
tree45ad176d873ed26187289ad1e2fe1e5bd923f030 /src/OpenDis.c
parentffd367f708b295abaedf3a23a1bfd4710d171d6f (diff)
Split public Xlib/XCB functions into libX11-xcb
We can never change the libX11 soname, and we don't want to commit to never changing the public Xlib/XCB functions, so split them into a separate library libX11-xcb. This also means that a program linked solely against libX11 should work with either Xlib or Xlib/XCB, which will make life easier for package maintainers. Signed-off-by: Josh Triplett <josh@freedesktop.org> Acked-by: Jamey Sharp <jamey@minilop.net>
Diffstat (limited to 'src/OpenDis.c')
-rw-r--r--src/OpenDis.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/OpenDis.c b/src/OpenDis.c
index c5c5557a..65f6eb80 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -363,7 +363,7 @@ XOpenDisplay (
#if USE_XCB
{
- const xcb_setup_t *xcbsetup = xcb_get_setup(XGetXCBConnection(dpy));
+ const xcb_setup_t *xcbsetup = xcb_get_setup(dpy->xcl->connection);
setuplength = xcbsetup->length << 2;
memcpy(&prefix, xcbsetup, sizeof(prefix));
setup = (char *) xcbsetup;
@@ -673,7 +673,7 @@ XOpenDisplay (
(void) XSynchronize(dpy, _Xdebug);
#if USE_XCB
- dpy->bigreq_size = xcb_get_maximum_request_length(XGetXCBConnection(dpy));
+ dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcl->connection);
if(dpy->bigreq_size <= dpy->max_request_size)
dpy->bigreq_size = 0;
#endif /* USE_XCB */
@@ -921,7 +921,7 @@ static void OutOfMemory (dpy, setup)
char *setup;
{
#if USE_XCB
- xcb_disconnect(XGetXCBConnection(dpy));
+ xcb_disconnect(dpy->xcl->connection);
#else /* !USE_XCB */
_XDisconnectDisplay (dpy->trans_conn);
#endif /* USE_XCB */