diff options
| author | Fathi Boudra <fabo@debian.org> | 2011-10-24 10:29:17 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2011-10-24 10:29:17 +0300 |
| commit | 13d94f967ca3e4a929bbc29746a3612df34d4fd9 (patch) | |
| tree | 1203e7391d281fa02b6384733d93195c47a08097 | |
| parent | 401041edcfd421760017a729466f911b8786a14a (diff) | |
| -rw-r--r-- | RenderSystems/GLES/src/EGL/X11/OgreX11EGLWindow.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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 +} |