1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/skia/patches/archive/0005-Bug-731384-Fix-clang-SK_OVERRIDE.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,36 @@
1.4 +From 80350275c72921ed5ac405c029ae33727467d7c5 Mon Sep 17 00:00:00 2001
1.5 +From: George Wright <gwright@mozilla.com>
1.6 +Date: Fri, 18 May 2012 14:15:50 -0400
1.7 +Subject: [PATCH 05/10] Bug 755869 - [8] Re-apply bug 731384 - Fix compile
1.8 + errors on older versions of clang r=mattwoodrow
1.9 +
1.10 +---
1.11 + gfx/skia/include/core/SkPostConfig.h | 9 +++++++++
1.12 + 1 files changed, 9 insertions(+), 0 deletions(-)
1.13 +
1.14 +diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
1.15 +index 8316f7a..041fe2a 100644
1.16 +--- a/gfx/skia/include/core/SkPostConfig.h
1.17 ++++ b/gfx/skia/include/core/SkPostConfig.h
1.18 +@@ -288,9 +288,18 @@
1.19 + #if defined(_MSC_VER)
1.20 + #define SK_OVERRIDE override
1.21 + #elif defined(__clang__)
1.22 ++#if __has_feature(cxx_override_control)
1.23 + // Some documentation suggests we should be using __attribute__((override)),
1.24 + // but it doesn't work.
1.25 + #define SK_OVERRIDE override
1.26 ++#elif defined(__has_extension)
1.27 ++#if __has_extension(cxx_override_control)
1.28 ++#define SK_OVERRIDE override
1.29 ++#endif
1.30 ++#endif
1.31 ++#ifndef SK_OVERRIDE
1.32 ++#define SK_OVERRIDE
1.33 ++#endif
1.34 + #else
1.35 + // Linux GCC ignores "__attribute__((override))" and rejects "override".
1.36 + #define SK_OVERRIDE
1.37 +--
1.38 +1.7.5.4
1.39 +
