Merge branch 'master' into next

[i3/i3] / include / xinerama.h

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