Merge branch 'master' into next

[i3/i3] / include / xinerama.h

diff --git a/include/xinerama.h b/include/xinerama.h
index 8c879c07fb7329c38b0c7fe8b2c5419a557d6cd7..936b9653b98ae6b3eb2b2220f24657de22505dad 100644 (file)
--- a/include/xinerama.h
+++ b/include/xinerama.h
@@ -2,15 +2,14 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This is LEGACY code (we support RandR, which can do much more than
  * Xinerama), but necessary for the poor users of the nVidia binary
  * driver which does not support RandR in 2011 *sigh*.
  *
  */
-#ifndef _XINERAMA_H
-#define _XINERAMA_H
+#pragma once
 
 #include "data.h"
 
@@ -20,5 +19,3 @@
  *
  */
 void xinerama_init(void);
-
-#endif