Merge branch 'master' of git://anongit.freedesktop.org/git/xcb/libxcb

[free-sw/xcb/libxcb] / src / xcbxlib.h

diff --git a/src/xcbxlib.h b/src/xcbxlib.h
index e9f7140..4cb5cd4 100644 (file)
--- a/src/xcbxlib.h
+++ b/src/xcbxlib.h
@@ -25,14 +25,20 @@
  * authorization from the authors.
  */
 
+/* This include file declares functions used by Xlib/XCB, but nothing else
+ * should ever use these functions or link to libxcb-xlib. */
+
 #ifndef __XCBXLIB_H
 #define __XCBXLIB_H
 
 #include <pthread.h>
 #include "xcb.h"
 
-unsigned int XCBGetRequestSent(XCBConnection *c);
+/* The caller of this function must hold the xlib lock, using the lock
+ * functions below. */
+unsigned int xcb_get_request_sent(xcb_connection_t *c);
 
-pthread_mutex_t *XCBGetIOLock(XCBConnection *c);
+void xcb_xlib_lock(xcb_connection_t *c);
+void xcb_xlib_unlock(xcb_connection_t *c);
 
 #endif