wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 896049 - Define SK_OVERRIDE with a default value if it hasn't been defined previously. r=gw280

Browse Source
This commit is contained in:
Arnaud Sourioux 2013-07-24 09:17:15 -04:00
parent 809cc4b70c
commit e48cfc9f45
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/skia/include/core/SkPostConfig.h
View File

@ -330,9 +330,9 @@
#define SK_OVERRIDE override
#endif
#endif
#else
// Linux GCC ignores "__attribute__((override))" and rejects "override".
#define SK_OVERRIDE
#endif
#ifndef SK_OVERRIDE
#define SK_OVERRIDE
#endif
#endif

26
gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
--- a/gfx/skia/include/core/SkPostConfig.h
+++ b/gfx/skia/include/core/SkPostConfig.h
@@ -325,19 +325,19 @@
// 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
- #else
- // Linux GCC ignores "__attribute__((override))" and rejects "override".
- #define SK_OVERRIDE
+ #endif
+ #ifndef SK_OVERRIDE
+ #define SK_OVERRIDE
#endif
#endif
//////////////////////////////////////////////////////////////////////
#ifndef SK_PRINTF_LIKE
#if defined(__clang__) || defined(__GNUC__)
#define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B))))