gfx/skia/patches/archive/SkPostConfig.patch@deefc01c0e14 (annotated)
gfx/skia/patches/archive/SkPostConfig.patch
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
| michael@0 | 1 | diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 2 | --- a/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 3 | +++ b/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 4 | @@ -277,19 +277,28 @@ |
| michael@0 | 5 | #endif |
| michael@0 | 6 | |
| michael@0 | 7 | ////////////////////////////////////////////////////////////////////// |
| michael@0 | 8 | |
| michael@0 | 9 | #ifndef SK_OVERRIDE |
| michael@0 | 10 | #if defined(_MSC_VER) |
| michael@0 | 11 | #define SK_OVERRIDE override |
| michael@0 | 12 | #elif defined(__clang__) |
| michael@0 | 13 | +#if __has_feature(cxx_override_control) |
| michael@0 | 14 | // Some documentation suggests we should be using __attribute__((override)), |
| michael@0 | 15 | // but it doesn't work. |
| michael@0 | 16 | #define SK_OVERRIDE override |
| michael@0 | 17 | +#elif defined(__has_extension) |
| michael@0 | 18 | +#if __has_extension(cxx_override_control) |
| michael@0 | 19 | +#define SK_OVERRIDE override |
| michael@0 | 20 | +#endif |
| michael@0 | 21 | +#endif |
| michael@0 | 22 | +#ifndef SK_OVERRIDE |
| michael@0 | 23 | +#define SK_OVERRIDE |
| michael@0 | 24 | +#endif |
| michael@0 | 25 | #else |
| michael@0 | 26 | // Linux GCC ignores "__attribute__((override))" and rejects "override". |
| michael@0 | 27 | #define SK_OVERRIDE |
| michael@0 | 28 | #endif |
| michael@0 | 29 | #endif |
| michael@0 | 30 | |
| michael@0 | 31 | ////////////////////////////////////////////////////////////////////// |
| michael@0 | 32 |
