From 68f0bac60a397caa521f570134d14337a5ba86a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 2 Nov 2012 12:23:23 +0100 Subject: [PATCH] Fixed compilation of Contexts::EglContextHandler. --- src/Contexts/EglContextHandler.cpp | 2 ++ src/Contexts/EglContextHandler.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/Contexts/EglContextHandler.cpp b/src/Contexts/EglContextHandler.cpp index c21b1ecf7..fe89eb477 100644 --- a/src/Contexts/EglContextHandler.cpp +++ b/src/Contexts/EglContextHandler.cpp @@ -15,6 +15,8 @@ #include "EglContextHandler.h" +#include + #include "Context.h" namespace Magnum { namespace Contexts { diff --git a/src/Contexts/EglContextHandler.h b/src/Contexts/EglContextHandler.h index 7c9eab9c6..ae5f3daf0 100644 --- a/src/Contexts/EglContextHandler.h +++ b/src/Contexts/EglContextHandler.h @@ -26,6 +26,9 @@ #endif #include +/* undef Xlib nonsense to avoid conflicts */ +#undef None + #include "AbstractContextHandler.h" #include "magnumCompatibility.h"