Cleanup|X11: Dealing again with X11 preprocessor defines

skyjake · Jul 26, 2016 · 4afc21a · 4afc21a
1 parent 7f5f21d
commit 4afc21a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/doomsday/sdk/libgui/src/graphics/glentrypoints.cpp b/doomsday/sdk/libgui/src/graphics/glentrypoints.cpp
@@ -23,6 +23,8 @@
 
 #ifdef DENG_X11
 #  include <GL/glx.h>
+#  undef Always
+#  undef None
 #endif
 
 #ifdef LIBGUI_FETCH_GL_1_3

diff --git a/doomsday/sdk/libgui/src/graphics/glentrypoints_x11.cpp b/doomsday/sdk/libgui/src/graphics/glentrypoints_x11.cpp
@@ -26,6 +26,9 @@
 #include <GL/glx.h>
 #include <GL/glxext.h>
 
+#undef None
+#undef Always
+
 PFNGLXSWAPINTERVALEXTPROC   glXSwapIntervalEXT;
 
 void getGLXEntryPoints()