Merge branch 'master' into next

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

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 8b439ee0af3861e89ce3fdedf88fd4ddd35fbb16..74bd21528501d3b4701043ef51691c30e2891a61 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -1,7 +1,7 @@
 /*
  * i3bar - an xcb-based status- and ws-bar for i3
  *
- * © 2010 Axel Wagner and contributors
+ * © 2010-2011 Axel Wagner and contributors
  *
  * See file LICNSE for license information
  *
@@ -9,18 +9,19 @@
 #ifndef COMMON_H_
 #define COMMON_H_
 
+#include <stdbool.h>
+
 typedef struct rect_t rect;
-typedef int bool;
 
 struct ev_loop* main_loop;
 char            *statusline;
 char            *statusline_buffer;
 
 struct rect_t {
-       int     x;
-       int     y;
-       int     w;
-       int     h;
+    int x;
+    int y;
+    int w;
+    int h;
 };
 
 #include "queue.h"
@@ -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"