Merge branch 'master' into next

[i3/i3] / include / xinerama.h

diff --git a/include/xinerama.h b/include/xinerama.h
index 8c879c07fb7329c38b0c7fe8b2c5419a557d6cd7..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"