From 1c3e386e35bd59c91de2038516d613623484ff00 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Mon, 23 Mar 2020 01:47:39 +0200 Subject: [PATCH] Undef xlib nonsense to avoid conflicts --- src/Magnum/Platform/AbstractXApplication.h | 1 + src/Magnum/Platform/WindowlessGlxApplication.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index fdaeb2110..278c5cece 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -44,6 +44,7 @@ #undef Convex #undef None #undef Status +#undef Success #undef Button1 #undef Button2 #undef Button3 diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index cefbf122f..6d1ebca2f 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -50,6 +50,12 @@ #undef Convex #undef None #undef Status +#undef Success +#undef Button1 +#undef Button2 +#undef Button3 +#undef Button4 +#undef Button5 namespace Magnum { namespace Platform {