Merge branch 'master' into next

[i3/i3] / include / handlers.h

diff --git a/include/handlers.h b/include/handlers.h
index 0aaaf158a67c33730958e5ba3ede0a087ae2dbb9..b2e7ce2e9288c3751486c22d3f4964734f351297 100644 (file)
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -1,15 +1,15 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * handlers.c: Small handlers for various events (keypresses, focus changes,
+ *             …).
  *
  */
-#ifndef _HANDLERS_H
-#define _HANDLERS_H
+#ifndef I3_HANDLERS_H
+#define I3_HANDLERS_H
 
 #include <xcb/randr.h>
 
@@ -43,7 +43,7 @@ void handle_event(int type, xcb_generic_event_t *event);
  * received from X11
  *
  */
-void property_handlers_init();
+void property_handlers_init(void);
 
 #if 0
 /**