1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,26 @@
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 +@@ -325,19 +325,19 @@
1.8 + // Some documentation suggests we should be using __attribute__((override)),
1.9 + // but it doesn't work.
1.10 + #define SK_OVERRIDE override
1.11 + #elif defined(__has_extension)
1.12 + #if __has_extension(cxx_override_control)
1.13 + #define SK_OVERRIDE override
1.14 + #endif
1.15 + #endif
1.16 +- #else
1.17 +- // Linux GCC ignores "__attribute__((override))" and rejects "override".
1.18 +- #define SK_OVERRIDE
1.19 ++ #endif
1.20 ++ #ifndef SK_OVERRIDE
1.21 ++ #define SK_OVERRIDE
1.22 + #endif
1.23 + #endif
1.24 +
1.25 + //////////////////////////////////////////////////////////////////////
1.26 +
1.27 + #ifndef SK_PRINTF_LIKE
1.28 + #if defined(__clang__) || defined(__GNUC__)
1.29 + #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B))))
