Merge branch 'master' into next

[i3/i3] / include / xcb_compat.h

diff --git a/include/xcb_compat.h b/include/xcb_compat.h
index fc09a254323953afb13a7ed76147e0e988f6d719..89c2c457887ed0d660cc6518f5a0efae405fbac9 100644 (file)
--- a/include/xcb_compat.h
+++ b/include/xcb_compat.h
@@ -9,8 +9,7 @@
  *               older versions.
  *
  */
-#ifndef I3_XCB_COMPAT_H
-#define I3_XCB_COMPAT_H
+#pragma once
 
 #define xcb_icccm_get_wm_protocols_reply_t xcb_get_wm_protocols_reply_t
 #define xcb_icccm_get_wm_protocols xcb_get_wm_protocols
@@ -20,9 +19,12 @@
 #define XCB_ICCCM_WM_STATE_NORMAL XCB_WM_STATE_NORMAL
 #define XCB_ICCCM_WM_STATE_WITHDRAWN XCB_WM_STATE_WITHDRAWN
 #define xcb_icccm_get_wm_size_hints_from_reply xcb_get_wm_size_hints_from_reply
+#define xcb_icccm_get_wm_size_hints_reply xcb_get_wm_size_hints_reply
+#define xcb_icccm_get_wm_normal_hints xcb_get_wm_normal_hints
 #define xcb_icccm_get_wm_normal_hints_reply xcb_get_wm_normal_hints_reply
 #define xcb_icccm_get_wm_normal_hints_unchecked xcb_get_wm_normal_hints_unchecked
 #define XCB_ICCCM_SIZE_HINT_P_MIN_SIZE XCB_SIZE_HINT_P_MIN_SIZE
+#define XCB_ICCCM_SIZE_HINT_P_MAX_SIZE XCB_SIZE_HINT_P_MAX_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_RESIZE_INC XCB_SIZE_HINT_P_RESIZE_INC
 #define XCB_ICCCM_SIZE_HINT_BASE_SIZE XCB_SIZE_HINT_BASE_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_ASPECT XCB_SIZE_HINT_P_ASPECT
@@ -43,5 +45,3 @@
 #define XCB_ATOM_ATOM ATOM
 #define XCB_ATOM_WM_NORMAL_HINTS WM_NORMAL_HINTS
 #define XCB_ATOM_STRING STRING
-
-#endif