michael@0: From 80350275c72921ed5ac405c029ae33727467d7c5 Mon Sep 17 00:00:00 2001
michael@0: From: George Wright <gwright@mozilla.com>
michael@0: Date: Fri, 18 May 2012 14:15:50 -0400
michael@0: Subject: [PATCH 05/10]     Bug 755869 - [8] Re-apply bug 731384 - Fix compile
michael@0:  errors on older versions of clang r=mattwoodrow
michael@0: 
michael@0: ---
michael@0:  gfx/skia/include/core/SkPostConfig.h |    9 +++++++++
michael@0:  1 files changed, 9 insertions(+), 0 deletions(-)
michael@0: 
michael@0: diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
michael@0: index 8316f7a..041fe2a 100644
michael@0: --- a/gfx/skia/include/core/SkPostConfig.h
michael@0: +++ b/gfx/skia/include/core/SkPostConfig.h
michael@0: @@ -288,9 +288,18 @@
michael@0:  #if defined(_MSC_VER)
michael@0:  #define SK_OVERRIDE override
michael@0:  #elif defined(__clang__)
michael@0: +#if __has_feature(cxx_override_control)
michael@0:  // Some documentation suggests we should be using __attribute__((override)),
michael@0:  // but it doesn't work.
michael@0:  #define SK_OVERRIDE override
michael@0: +#elif defined(__has_extension)
michael@0: +#if __has_extension(cxx_override_control)
michael@0: +#define SK_OVERRIDE override
michael@0: +#endif
michael@0: +#endif
michael@0: +#ifndef SK_OVERRIDE
michael@0: +#define SK_OVERRIDE
michael@0: +#endif
michael@0:  #else
michael@0:  // Linux GCC ignores "__attribute__((override))" and rejects "override".
michael@0:  #define SK_OVERRIDE
michael@0: -- 
michael@0: 1.7.5.4
michael@0: