Platform: undefine more Xlib nonsense.

Status conflicts with *Framebuffer::Status enum.
13 years ago · ae2b2cd0f6
3 changed files with 7 additions and 3 deletions
--- a/src/Platform/AbstractXApplication.h
+++ b/src/Platform/AbstractXApplication.h
@ -35,9 +35,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Always
 #undef Complex
 #undef None
-#undef Always
+#undef Status

 #include "Math/Vector2.h"

--- a/src/Platform/Implementation/GlxContextHandler.h
+++ b/src/Platform/Implementation/GlxContextHandler.h
@ -25,11 +25,13 @@
 */

 #include "OpenGL.h"
+#define Status int
 #include <GL/glx.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Always
 #undef Complex
 #undef None
-#undef Always
+#undef Status

 #include "Platform/AbstractXApplication.h"
 #include "Platform/Implementation/AbstractContextHandler.h"
--- a/src/Platform/WindowlessGlxApplication.h
+++ b/src/Platform/WindowlessGlxApplication.h
@ -34,9 +34,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 /* undef Xlib nonsense to avoid conflicts */
+#undef Always
 #undef Complex
 #undef None
-#undef Always
+#undef Status

 #include "Magnum.h"