From 2882958fdef3235a1f61d144e429d5d2f9c1994d Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 6 Apr 2011 12:54:52 +0200
Subject: [PATCH] Fixup to 35e6608ce14d05973c6ceee4c2ee046d10af4aaf

---
 .../xcomposite_share/xlibinclude.h                 | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h b/src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h
index 2e67fba..78c7c48 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h
+++ b/src/qt-compositor/hardware_integration/xcomposite_share/xlibinclude.h
@@ -1,3 +1,6 @@
+#ifndef XLIBINCLUDE_H
+#define XLIBINCLUDE_H
+
 #include <QtCore/QEvent>
 #include <QtCore/QTextStream>
 #include <QtCore/QDataStream>
@@ -6,3 +9,28 @@
 #include <QtGui/QCursor>
 
 #include <X11/Xlib.h>
+
+enum {
+    XFocusOut = FocusOut,
+    XFocusIn = FocusIn,
+    XKeyPress = KeyPress,
+    XKeyRelease = KeyRelease,
+    XNone = None,
+    XRevertToParent = RevertToParent,
+    XGrayScale = GrayScale,
+    XCursorShape = CursorShape
+};
+#undef FocusOut
+#undef FocusIn
+#undef KeyPress
+#undef KeyRelease
+#undef None
+#undef RevertToParent
+#undef GrayScale
+#undef CursorShape
+
+#ifdef FontChange
+#undef FontChange
+#endif
+
+#endif //XLIBINCLUDE_H
-- 
2.7.4