Merge branch 'master' into next

[i3/i3] / i3bar / include / common.h

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 644b777c738c3fd3a0014448970ddded34ed1c0e..74bd21528501d3b4701043ef51691c30e2891a61 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -9,8 +9,9 @@
 #ifndef COMMON_H_
 #define COMMON_H_
 
+#include <stdbool.h>
+
 typedef struct rect_t rect;
-typedef int bool;
 
 struct ev_loop* main_loop;
 char            *statusline;
@@ -29,6 +30,7 @@ struct rect_t {
 #include "outputs.h"
 #include "util.h"
 #include "workspaces.h"
+#include "trayclients.h"
 #include "xcb.h"
 #include "ucs2_to_utf8.h"
 #include "config.h"