UnityShell: fix compilation due to evil compiz #define's

(bzr r3506.5.18)

2 files changed, 17 insertions, 4 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 847890297..3d2dc0e71 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -760,9 +760,9 @@ void UnityScreen::paintDisplay()
 unsigned int oldGlAddGeometryIndex = uTrayWindow->gWindow->glAddGeometryGetCurrentIndex ();
 unsigned int oldGlDrawIndex = uTrayWindow->gWindow->glDrawGetCurrentIndex ();
 
- attrib.opacity = OPAQUE;
- attrib.brightness = BRIGHT;
- attrib.saturation = COLOR;
+ attrib.opacity = COMPIZ_COMPOSITE_OPAQUE;
+ attrib.brightness = COMPIZ_COMPOSITE_BRIGHT;
+ attrib.saturation = COMPIZ_COMPOSITE_COLOR;
 
 oTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index aa04b242b..e2b50badf 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -31,9 +31,22 @@
 #include <scale/scale.h>
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
-#include <composite/composite.h>
 #include <opengl/opengl.h>
 
+// These fixes some definitions from the composite header
+#ifdef COLOR
+#define COMPIZ_COMPOSITE_COLOR 0xffff
+#undef COLOR
+#endif
+#ifdef OPAQUE
+#define COMPIZ_COMPOSITE_OPAQUE 0xffff
+#undef OPAQUE
+#endif
+#ifdef BRIGHT
+#define COMPIZ_COMPOSITE_BRIGHT 0xffff
+#undef BRIGHT
+#endif
+
 #include "unityshell_options.h"
 
 #include "Introspectable.h"