From 4dff4f724b5a9298099335ebc561afe42ad579c1 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 4 Oct 2016 15:42:42 +0200 Subject: [PATCH] Utility/X11: Fix xcb_renderutil.h compile error on olders systems (Travis CI for example) Former-commit-id: d244d237356fa61293e8af28654a97df3f127de6 [formerly 348621c8a478a8b2f286b5fcb02b687e10216294] [formerly 25deef8c480e56fe2d2e0f1f8a22b942ace56ef6 [formerly e936f13a7c07985663fc0d35e4d0332a7aad6762]] Former-commit-id: f419ba91ab932b4695632bf2bf6e13cb2d396ffb [formerly 4d66289f24743ce633846a33207a46be5b97f307] Former-commit-id: 38f18e32f5e7154f8bbad8869559279ae268ddee --- src/Nazara/Utility/X11/CursorImpl.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Nazara/Utility/X11/CursorImpl.cpp b/src/Nazara/Utility/X11/CursorImpl.cpp index 8cdde5170..ca40b0e64 100644 --- a/src/Nazara/Utility/X11/CursorImpl.cpp +++ b/src/Nazara/Utility/X11/CursorImpl.cpp @@ -9,7 +9,14 @@ #include #include #include + +// Some older versions of xcb/util-renderutil (notably the one available on Travis CI) use `template` as an argument name +// This is a fixed bug (https://cgit.freedesktop.org/xcb/util-renderutil/commit/?id=8d15acc45a47dc4c922eee5b99885db42bc62c17) but until Travis-CI +// has upgraded their Ubuntu version, I'm forced to use this ugly trick. +#define template ptemplate #include +#undef template + #include namespace Nz