зеркало из https://github.com/mozilla/gecko-dev.git
37 строки
1.1 KiB
Diff
37 строки
1.1 KiB
Diff
|
From 80350275c72921ed5ac405c029ae33727467d7c5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: George Wright <gwright@mozilla.com>
|
||
|
|
Date: Fri, 18 May 2012 14:15:50 -0400
|
||
|
|
Subject: [PATCH 05/10] 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 files changed, 9 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
|
||
|
|
index 8316f7a..041fe2a 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
|
||
|
|
--
|
||
|
|
1.7.5.4
|
||
|
|
|