The Tor Browser / file comparison
comparison: gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch
gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
equal
deleted
inserted
replaced
| -1:000000000000 | 0:67be092cdfaa |
|---|---|
| 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 @@ -325,19 +325,19 @@ | |
| 5 // Some documentation suggests we should be using __attribute__((override)), | |
| 6 // but it doesn't work. | |
| 7 #define SK_OVERRIDE override | |
| 8 #elif defined(__has_extension) | |
| 9 #if __has_extension(cxx_override_control) | |
| 10 #define SK_OVERRIDE override | |
| 11 #endif | |
| 12 #endif | |
| 13 - #else | |
| 14 - // Linux GCC ignores "__attribute__((override))" and rejects "override". | |
| 15 - #define SK_OVERRIDE | |
| 16 + #endif | |
| 17 + #ifndef SK_OVERRIDE | |
| 18 + #define SK_OVERRIDE | |
| 19 #endif | |
| 20 #endif | |
| 21 | |
| 22 ////////////////////////////////////////////////////////////////////// | |
| 23 | |
| 24 #ifndef SK_PRINTF_LIKE | |
| 25 #if defined(__clang__) || defined(__GNUC__) | |
| 26 #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B)))) |
