Merge branch 'master' into next

[i3/i3] / include / sighandler.h

diff --git a/include/sighandler.h b/include/sighandler.h
index 4931743877e3e6eed6cb73f740a30d8835a613a8..571070b04230079a1ae606400d1346ae8bb688fc 100644 (file)
--- a/include/sighandler.h
+++ b/include/sighandler.h
@@ -1,12 +1,12 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  * © 2009-2010 Jan-Erik Rediger
  *
- * See file LICENSE for license information.
+ * sighandler.c: Interactive crash dialog upon SIGSEGV/SIGABRT/SIGFPE (offers
+ *               to restart inplace).
  *
  */
 #ifndef _SIGHANDLER_H
@@ -16,6 +16,6 @@
  * Setup signal handlers to safely handle SIGSEGV and SIGFPE
  *
  */
-void setup_signal_handler();
+void setup_signal_handler(void);
 
 #endif