From 7952c1531a17c67855f29d8a3a5bb8117b8104b1 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 4 Oct 2016 18:09:15 +0200 Subject: [PATCH] Utility/X11: Fix compilation on Ubuntu 14.04 Former-commit-id: ec60ac14249ec8373b94adc151689bb296a32eb8 [formerly f133d000ffa0af394ff13f1cdb5c15998e168cb3] [formerly a273e695a23571703a86fb48baf2b3481a880e7f [formerly 16e55866c0bf4159de7ab70f01f10ee8cd85c460]] Former-commit-id: 4119b010eb683593fc1a874a18cd43258a7bb686 [formerly 4f25a87bee75670940a2ad68b61a32342e3ddcf9] Former-commit-id: f811f2c2dbe89bf4a9442b11a2c50b54719c85bd --- src/Nazara/Utility/X11/CursorImpl.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Nazara/Utility/X11/CursorImpl.cpp b/src/Nazara/Utility/X11/CursorImpl.cpp index ca40b0e64..d09f51a1f 100644 --- a/src/Nazara/Utility/X11/CursorImpl.cpp +++ b/src/Nazara/Utility/X11/CursorImpl.cpp @@ -14,7 +14,10 @@ // 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 +extern "C" +{ + #include +} #undef template #include