From 792198ae897ba9b0143b62eb3a8f3d00c5b5dd80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 28 Feb 2013 01:00:24 +0100
Subject: [PATCH] Platform: undefine another conflicting macro.

---
 src/Platform/GlxContextHandler.h        | 1 +
 src/Platform/WindowlessGlxApplication.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Platform/GlxContextHandler.h b/src/Platform/GlxContextHandler.h
index 1a8f7b85f..e78df00ba 100644
--- a/src/Platform/GlxContextHandler.h
+++ b/src/Platform/GlxContextHandler.h
@@ -22,6 +22,7 @@
 #include "Magnum.h"
 #include <GL/glx.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Complex
 #undef None
 #undef Always
 
diff --git a/src/Platform/WindowlessGlxApplication.h b/src/Platform/WindowlessGlxApplication.h
index 1722e82e3..541b0a9f4 100644
--- a/src/Platform/WindowlessGlxApplication.h
+++ b/src/Platform/WindowlessGlxApplication.h
@@ -24,6 +24,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Complex
 #undef None
 #undef Always