From 6aaada5c75e7ed5f97dafee3c095f99603f5503f Mon Sep 17 00:00:00 2001
From: George Wright <gwright@mozilla.com>
Date: Fri, 18 May 2012 14:15:50 -0400
Subject: [PATCH]     Bug 755869 - [8] Re-apply bug 731384 - Fix compile errors
 on older versions of clang r=mattwoodrow

---
 gfx/skia/include/core/SkPostConfig.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
index 8316f7a0a4bd..041fe2a85da1 100644
--- a/gfx/skia/include/core/SkPostConfig.h
+++ b/gfx/skia/include/core/SkPostConfig.h
@@ -288,9 +288,18 @@
 #if defined(_MSC_VER)
 #define SK_OVERRIDE override
 #elif defined(__clang__)
+#if __has_feature(cxx_override_control)
 // Some documentation suggests we should be using __attribute__((override)),
 // but it doesn't work.
 #define SK_OVERRIDE override
+#elif defined(__has_extension)
+#if __has_extension(cxx_override_control)
+#define SK_OVERRIDE override
+#endif
+#endif
+#ifndef SK_OVERRIDE
+#define SK_OVERRIDE
+#endif
 #else
 // Linux GCC ignores "__attribute__((override))" and rejects "override".
 #define SK_OVERRIDE