The Tor Browser / file comparison
comparison: gfx/skia/patches/archive/SkPostConfig.patch
gfx/skia/patches/archive/SkPostConfig.patch
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
equal
deleted
inserted
replaced
| -1:000000000000 | 0:f5d65c4a4b01 |
|---|---|
| 1 diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h | |
| 2 --- a/gfx/skia/include/core/SkPostConfig.h | |
| 3 +++ b/gfx/skia/include/core/SkPostConfig.h | |
| 4 @@ -277,19 +277,28 @@ | |
| 5 #endif | |
| 6 | |
| 7 ////////////////////////////////////////////////////////////////////// | |
| 8 | |
| 9 #ifndef SK_OVERRIDE | |
| 10 #if defined(_MSC_VER) | |
| 11 #define SK_OVERRIDE override | |
| 12 #elif defined(__clang__) | |
| 13 +#if __has_feature(cxx_override_control) | |
| 14 // Some documentation suggests we should be using __attribute__((override)), | |
| 15 // but it doesn't work. | |
| 16 #define SK_OVERRIDE override | |
| 17 +#elif defined(__has_extension) | |
| 18 +#if __has_extension(cxx_override_control) | |
| 19 +#define SK_OVERRIDE override | |
| 20 +#endif | |
| 21 +#endif | |
| 22 +#ifndef SK_OVERRIDE | |
| 23 +#define SK_OVERRIDE | |
| 24 +#endif | |
| 25 #else | |
| 26 // Linux GCC ignores "__attribute__((override))" and rejects "override". | |
| 27 #define SK_OVERRIDE | |
| 28 #endif | |
| 29 #endif | |
| 30 | |
| 31 ////////////////////////////////////////////////////////////////////// | |
| 32 |
