From a96bd348d2cca3627fd2d444df6b221de66cf061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 2 Jan 2014 22:34:48 +0100 Subject: [PATCH] Platform: remove #define None. We need to live without that. --- src/Platform/Implementation/GlxContextHandler.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Platform/Implementation/GlxContextHandler.cpp b/src/Platform/Implementation/GlxContextHandler.cpp index dc80b6c7e..cf96b3e11 100644 --- a/src/Platform/Implementation/GlxContextHandler.cpp +++ b/src/Platform/Implementation/GlxContextHandler.cpp @@ -30,8 +30,6 @@ #include "Context.h" -#define None 0L // redef Xlib nonsense - namespace Magnum { namespace Platform { namespace Implementation { VisualID GlxContextHandler::getVisualId(Display* nativeDisplay) { @@ -94,7 +92,7 @@ void GlxContextHandler::createContext(Window nativeWindow) { } GlxContextHandler::~GlxContextHandler() { - glXMakeCurrent(display, None, nullptr); + glXMakeCurrent(display, 0, nullptr); glXDestroyContext(display, context); }