Merge branch 'master' into next

[i3/i3] / include / log.h

diff --git a/include/log.h b/include/log.h
index c1e10b0639b321727d95efaf09783423ba8d1884..0eb5574444c06fc8b30356721fd9a44ad3fbeb96 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -2,10 +2,9 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * log.c: Setting of loglevels, logging functions.
  *
  */
 #ifndef _LOG_H
@@ -22,6 +21,8 @@
 
 extern char *loglevels[];
 extern char *errorfilename;
+extern char *shmlogname;
+extern int shmlog_size;
 
 /**
  * Initializes logging by creating an error logfile in /tmp (or