Merge branch 'master' into next

[i3/i3] / include / xinerama.h

diff --git a/include/xinerama.h b/include/xinerama.h
index e6304b56bea79f4ab30760a3fb14caadd75ff25f..ca7c2ab538a3938b42a6efdaaabc1bcb0833b047 100644 (file)
--- a/include/xinerama.h
+++ b/include/xinerama.h
@@ -9,8 +9,8 @@
  * driver which does not support RandR in 2011 *sigh*.
  *
  */
-#ifndef _XINERAMA_H
-#define _XINERAMA_H
+#ifndef I3_XINERAMA_H
+#define I3_XINERAMA_H
 
 #include "data.h"
 
@@ -19,6 +19,6 @@
  * Xinerama information to setup workspaces for each screen.
  *
  */
-void xinerama_init();
+void xinerama_init(void);
 
 #endif