From 13d94f967ca3e4a929bbc29746a3612df34d4fd9 Mon Sep 17 00:00:00 2001
From: Fathi Boudra <fabo@debian.org>
Date: Mon, 24 Oct 2011 10:29:17 +0300
Subject: work around build failure caused by undefined None

---
 RenderSystems/GLES/src/EGL/X11/OgreX11EGLWindow.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/RenderSystems/GLES/src/EGL/X11/OgreX11EGLWindow.cpp b/RenderSystems/GLES/src/EGL/X11/OgreX11EGLWindow.cpp
index 7d45227..c6e467b 100644
--- a/RenderSystems/GLES/src/EGL/X11/OgreX11EGLWindow.cpp
+++ b/RenderSystems/GLES/src/EGL/X11/OgreX11EGLWindow.cpp
@@ -43,6 +43,11 @@ THE SOFTWARE.
 #include <algorithm>
 #include <climits>
 
+// FIXME: None should be defined from X11 headers. need investigation
+#ifndef None
+#define None                 0L /* universal null resource or null atom */
+#endif
+
 extern "C"
 {
     int safeXErrorHandler(Display *display, XErrorEvent *event)
@@ -591,4 +596,4 @@ namespace Ogre {
 
 
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3