diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index 1231ccc64a..2496fcdc52 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -40,6 +40,7 @@ #include /* undef Xlib nonsense to avoid conflicts */ #undef Always +#undef Bool #undef Complex #undef Convex #undef None @@ -51,6 +52,9 @@ #undef Button4 #undef Button5 +/* Unfortunately Xlib *needs* the Bool type, so provide a typedef instead */ +typedef int Bool; + #include "Magnum/Magnum.h" #include "Magnum/Tags.h" #include "Magnum/GL/GL.h" diff --git a/src/Magnum/Platform/WindowlessEglApplication.h b/src/Magnum/Platform/WindowlessEglApplication.h index dd250f2b4f..1aafc283c4 100644 --- a/src/Magnum/Platform/WindowlessEglApplication.h +++ b/src/Magnum/Platform/WindowlessEglApplication.h @@ -37,12 +37,16 @@ #include /* undef Xlib nonsense to avoid conflicts */ #undef Always +#undef Bool #undef Complex #undef None #undef Status #include #include +/* Unfortunately Xlib *needs* the Bool type, so provide a typedef instead */ +typedef int Bool; + #include "Magnum/Magnum.h" #include "Magnum/GL/OpenGL.h" #include "Magnum/Tags.h" diff --git a/src/Magnum/Platform/WindowlessGlxApplication.h b/src/Magnum/Platform/WindowlessGlxApplication.h index 6f3fcf1d2c..9779e39fca 100644 --- a/src/Magnum/Platform/WindowlessGlxApplication.h +++ b/src/Magnum/Platform/WindowlessGlxApplication.h @@ -46,6 +46,7 @@ #include /* undef Xlib nonsense to avoid conflicts */ #undef Always +#undef Bool #undef Complex #undef Convex #undef None @@ -57,6 +58,9 @@ #undef Button4 #undef Button5 +/* Unfortunately Xlib *needs* the Bool type, so provide a typedef instead */ +typedef int Bool; + namespace Magnum { namespace Platform { /**