0005-Bug-731384-Fix-clang-SK_OVERRIDE.patch (1154B)
1 From 80350275c72921ed5ac405c029ae33727467d7c5 Mon Sep 17 00:00:00 2001 2 From: George Wright <gwright@mozilla.com> 3 Date: Fri, 18 May 2012 14:15:50 -0400 4 Subject: [PATCH 05/10] Bug 755869 - [8] Re-apply bug 731384 - Fix compile 5 errors on older versions of clang r=mattwoodrow 6 7 --- 8 gfx/skia/include/core/SkPostConfig.h | 9 +++++++++ 9 1 files changed, 9 insertions(+), 0 deletions(-) 10 11 diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h 12 index 8316f7a..041fe2a 100644 13 --- a/gfx/skia/include/core/SkPostConfig.h 14 +++ b/gfx/skia/include/core/SkPostConfig.h 15 @@ -288,9 +288,18 @@ 16 #if defined(_MSC_VER) 17 #define SK_OVERRIDE override 18 #elif defined(__clang__) 19 +#if __has_feature(cxx_override_control) 20 // Some documentation suggests we should be using __attribute__((override)), 21 // but it doesn't work. 22 #define SK_OVERRIDE override 23 +#elif defined(__has_extension) 24 +#if __has_extension(cxx_override_control) 25 +#define SK_OVERRIDE override 26 +#endif 27 +#endif 28 +#ifndef SK_OVERRIDE 29 +#define SK_OVERRIDE 30 +#endif 31 #else 32 // Linux GCC ignores "__attribute__((override))" and rejects "override". 33 #define SK_OVERRIDE 34 -- 35 1.7.5.4