Merge branch 'master' into next

[i3/i3] / include / i3.h

diff --git a/include/i3.h b/include/i3.h
index fca983ecb816d2a06174c76b55120c76f0083b02..d64532545bb1a12179e115bf0194162c9a0279f6 100644 (file)
--- a/include/i3.h
+++ b/include/i3.h
@@ -2,12 +2,17 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * i3.h: global variables that are used all over i3.
  *
  */
+#ifndef _I3_H
+#define _I3_H
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
 #include <xcb/xcb_keysyms.h>
 
 #include <X11/XKBlib.h>
@@ -19,9 +24,12 @@
 #include "data.h"
 #include "xcb.h"
 
-#ifndef _I3_H
-#define _I3_H
-
+/** The original value of RLIMIT_CORE when i3 was started. We need to restore
+ * this before starting any other process, since we set RLIMIT_CORE to
+ * RLIM_INFINITY for i3 debugging versions. */
+extern struct rlimit original_rlimit_core;
+/** Whether this version of i3 is a debug build or a release build. */
+extern bool debug_build;
 extern xcb_connection_t *conn;
 extern int conn_screen;
 /** The last timestamp we got from X11 (timestamps are included in some events