diff options
author | marha <marha@users.sourceforge.net> | 2010-09-30 15:43:57 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-30 15:43:57 +0000 |
commit | 54fffe7283b49dcaae81e826eb0dff213552c4ec (patch) | |
tree | c3a8c65ebffb5841251bd16edec93f0576f77418 /libX11/include/X11/Xlib-xcb.h | |
parent | d718b0dd8ed27c6f8497077b8d4b088d9b7f7bd3 (diff) | |
parent | f952d0d771de6d9b8ecc3cbbe3624203723bbb25 (diff) | |
download | vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.gz vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.bz2 vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.zip |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/include/X11/Xlib-xcb.h')
-rw-r--r-- | libX11/include/X11/Xlib-xcb.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libX11/include/X11/Xlib-xcb.h b/libX11/include/X11/Xlib-xcb.h index 03d8f9867..a0339de12 100644 --- a/libX11/include/X11/Xlib-xcb.h +++ b/libX11/include/X11/Xlib-xcb.h @@ -1,20 +1,20 @@ -/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett - * This file is licensed under the MIT license. See the file COPYING. */ - -#ifndef XLIB_XCB_H -#define XLIB_XCB_H - -#include <xcb/xcb.h> -#include <X11/Xlib.h> -#include <X11/Xfuncproto.h> - -_XFUNCPROTOBEGIN - -xcb_connection_t *XGetXCBConnection(Display *dpy); - -enum XEventQueueOwner { XlibOwnsEventQueue = 0, XCBOwnsEventQueue }; -void XSetEventQueueOwner(Display *dpy, enum XEventQueueOwner owner); - -_XFUNCPROTOEND - -#endif /* XLIB_XCB_H */ +/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett
+ * This file is licensed under the MIT license. See the file COPYING. */
+
+#ifndef _X11_XLIB_XCB_H_
+#define _X11_XLIB_XCB_H_
+
+#include <xcb/xcb.h>
+#include <X11/Xlib.h>
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+xcb_connection_t *XGetXCBConnection(Display *dpy);
+
+enum XEventQueueOwner { XlibOwnsEventQueue = 0, XCBOwnsEventQueue };
+void XSetEventQueueOwner(Display *dpy, enum XEventQueueOwner owner);
+
+_XFUNCPROTOEND
+
+#endif /* _X11_XLIB_XCB_H_ */
|