More Xlib workarounds...

14 years ago · c2949d6b59
2 changed files with 5 additions and 0 deletions
--- a/src/Contexts/GlxContext.cpp
+++ b/src/Contexts/GlxContext.cpp
@ -18,6 +18,8 @@
 #include <GL/glxext.h>
 #include <Utility/Debug.h>

+#define None 0L // redef Xlib nonsense
+
 namespace Magnum { namespace Contexts {

 VisualID GlxContext::getVisualId(Display* nativeDisplay) {
--- a/src/Contexts/GlxContext.h
+++ b/src/Contexts/GlxContext.h
@ -21,6 +21,9 @@

 #include "Magnum.h"
 #include <GL/glx.h>
+/* undef Xlib nonsense to avoid conflicts */
+#undef None
+#undef Always

 #include "AbstractContext.h"