Merge branch 'master' into next

[i3/i3] / include / xcb_compat.h

diff --git a/include/xcb_compat.h b/include/xcb_compat.h
index ec872a3abeabf3eb9d4cfe4e39cc1f826680e887..9c2660b72b220d67d4e2d7a8d22a7ad3301e96b9 100644 (file)
--- a/include/xcb_compat.h
+++ b/include/xcb_compat.h
@@ -1,3 +1,14 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * xcb_compat.h: uses #define to create aliases for xcb functions which got
+ *               renamed. Makes the code work with >= 0.3.8 xcb-util and
+ *               older versions.
+ *
+ */
 #ifndef _XCB_COMPAT_H
 #define _XCB_COMPAT_H
 
@@ -16,6 +27,7 @@
 #define XCB_ICCCM_SIZE_HINT_BASE_SIZE XCB_SIZE_HINT_BASE_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_ASPECT XCB_SIZE_HINT_P_ASPECT
 #define xcb_icccm_wm_hints_t xcb_wm_hints_t
+#define xcb_icccm_get_wm_hints xcb_get_wm_hints
 #define xcb_icccm_get_wm_hints_from_reply xcb_get_wm_hints_from_reply
 #define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply
 #define xcb_icccm_get_wm_hints_unchecked xcb_get_wm_hints_unchecked