Merge branch 'master' into next

[i3/i3] / include / handlers.h

diff --git a/include/handlers.h b/include/handlers.h
index ebec34cf7e0f68c87b6c847bf84b8e81117dd62e..b2e7ce2e9288c3751486c22d3f4964734f351297 100644 (file)
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -8,8 +8,8 @@
  *             …).
  *
  */
-#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
 /**