From aa722cd5bd8d88cb10f80e432450c1d9bbc16f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 31 Oct 2019 11:43:20 +0100 Subject: [PATCH] Platform: Xlib.h is a bad, bad thing. --- src/Magnum/Platform/AbstractXApplication.h | 1 + src/Magnum/Platform/WindowlessGlxApplication.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index 2c08247c0..b2a7df849 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -41,6 +41,7 @@ /* undef Xlib nonsense to avoid conflicts */ #undef Always #undef Complex +#undef Convex #undef None #undef Status diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index ba1b1a3b3..e56f3c757 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -47,10 +47,10 @@ /* undef Xlib nonsense to avoid conflicts */ #undef Always #undef Complex +#undef Convex #undef None #undef Status - namespace Magnum { namespace Platform { /**