Merge branch 'master' into next

[i3/i3] / include / i3.h

diff --git a/include/i3.h b/include/i3.h
index 1bc8b55da13bd81a3b5aa6f93a1ee84c98a69016..5ca875417bb163c386e5da8d462ffcc6d1a2c486 100644 (file)
--- a/include/i3.h
+++ b/include/i3.h
@@ -7,13 +7,13 @@
  * i3.h: global variables that are used all over i3.
  *
  */
-#ifndef I3_I3_H
-#define I3_I3_H
+#pragma once
 
 #include <sys/time.h>
 #include <sys/resource.h>
 
 #include <xcb/xcb_keysyms.h>
+#include <xcb/xkb.h>
 
 #include <X11/XKBlib.h>
 
@@ -43,7 +43,7 @@ extern xcb_key_symbols_t *keysyms;
 extern char **start_argv;
 extern Display *xlibdpy, *xkbdpy;
 extern int xkb_current_group;
-extern TAILQ_HEAD(bindings_head, Binding) *bindings;
+extern TAILQ_HEAD(bindings_head, Binding) * bindings;
 extern TAILQ_HEAD(autostarts_head, Autostart) autostarts;
 extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always;
 extern TAILQ_HEAD(ws_assignments_head, Workspace_Assignment) ws_assignments;
@@ -62,5 +62,3 @@ extern bool xcursor_supported, xkb_supported;
 extern xcb_window_t root;
 extern struct ev_loop *main_loop;
 extern bool only_check_config;
-
-#endif