From 53fe599c543c78424d116a03cb314e62dcb2c2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= <jaakko.keranen@iki.fi>
Date: Thu, 24 Dec 2015 17:14:43 +0200
Subject: [PATCH] Fixed|X11: Undefined conflicting Xlib preprocessor symbol

---
 doomsday/apps/client/src/gl/sys_opengl.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doomsday/apps/client/src/gl/sys_opengl.cpp b/doomsday/apps/client/src/gl/sys_opengl.cpp
index 6764cc0546..2d117d2234 100644
--- a/doomsday/apps/client/src/gl/sys_opengl.cpp
+++ b/doomsday/apps/client/src/gl/sys_opengl.cpp
@@ -34,6 +34,7 @@
 #   define GETPROC(Type, x)   x = de::function_cast<Type>(wglGetProcAddress(#x))
 #elif defined(UNIX) && !defined(MACOSX)
 #   include <GL/glx.h>
+#   undef None
 #   define GETPROC(Type, x)   x = de::function_cast<Type>(glXGetProcAddress((GLubyte const *)#x))
 #endif