gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch@deefc01c0e14
gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.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.)
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
22 //////////////////////////////////////////////////////////////////////
24 #ifndef SK_PRINTF_LIKE
25 #if defined(__clang__) || defined(__GNUC__)
26 #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B))))
