1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/archive/SkPostConfig.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,32 @@
1.4 +diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
1.5 +--- a/gfx/skia/include/core/SkPostConfig.h
1.6 ++++ b/gfx/skia/include/core/SkPostConfig.h
1.7 +@@ -277,19 +277,28 @@
1.8 + #endif
1.9 +
1.10 + //////////////////////////////////////////////////////////////////////
1.11 +
1.12 + #ifndef SK_OVERRIDE
1.13 + #if defined(_MSC_VER)
1.14 + #define SK_OVERRIDE override
1.15 + #elif defined(__clang__)
1.16 ++#if __has_feature(cxx_override_control)
1.17 + // Some documentation suggests we should be using __attribute__((override)),
1.18 + // but it doesn't work.
1.19 + #define SK_OVERRIDE override
1.20 ++#elif defined(__has_extension)
1.21 ++#if __has_extension(cxx_override_control)
1.22 ++#define SK_OVERRIDE override
1.23 ++#endif
1.24 ++#endif
1.25 ++#ifndef SK_OVERRIDE
1.26 ++#define SK_OVERRIDE
1.27 ++#endif
1.28 + #else
1.29 + // Linux GCC ignores "__attribute__((override))" and rejects "override".
1.30 + #define SK_OVERRIDE
1.31 + #endif
1.32 + #endif
1.33 +
1.34 + //////////////////////////////////////////////////////////////////////
1.35 +
