aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-13 08:47:19 +0100
committermarha <marha@users.sourceforge.net>2012-02-13 08:47:19 +0100
commiteaa70945cb3f1a432b8c505ecede9ebc7769f36d (patch)
tree8e44ff4da739e384a2c6a34c1b42ecfb8e212344 /libxcb
parent474621addc25cb22865c54b70ffbec07c82eb04c (diff)
downloadvcxsrv-eaa70945cb3f1a432b8c505ecede9ebc7769f36d.tar.gz
vcxsrv-eaa70945cb3f1a432b8c505ecede9ebc7769f36d.tar.bz2
vcxsrv-eaa70945cb3f1a432b8c505ecede9ebc7769f36d.zip
libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/doc/Makefile.am4
-rw-r--r--libxcb/src/xcb_util.c2
-rw-r--r--libxcb/xcb-proto/Makefile.am2
3 files changed, 5 insertions, 3 deletions
diff --git a/libxcb/doc/Makefile.am b/libxcb/doc/Makefile.am
index 19255197c..dbe2e0b0c 100644
--- a/libxcb/doc/Makefile.am
+++ b/libxcb/doc/Makefile.am
@@ -2,7 +2,9 @@
EXTRA_DIST = \
tutorial/index.html \
tutorial/xcb.css \
-xcb.doxygen.in
+xcb.doxygen.in \
+xkb_internals \
+xkb_issues
docdirs = $(srcdir)/tutorial
diff --git a/libxcb/src/xcb_util.c b/libxcb/src/xcb_util.c
index 9329b81dd..7173db3f7 100644
--- a/libxcb/src/xcb_util.c
+++ b/libxcb/src/xcb_util.c
@@ -430,7 +430,7 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname,
#ifdef _WIN32
WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
- c = (xcb_connection_t *) &error_connection;
+ c = _xcb_conn_ret_error(XCB_CONN_ERROR);
goto out;
}
#endif
diff --git a/libxcb/xcb-proto/Makefile.am b/libxcb/xcb-proto/Makefile.am
index c272c6237..6bc14ada0 100644
--- a/libxcb/xcb-proto/Makefile.am
+++ b/libxcb/xcb-proto/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS = src xcbgen
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcb-proto.pc
-EXTRA_DIST=doc xcb-proto.pc.in
+EXTRA_DIST=doc xcb-proto.pc.in autogen.sh