diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 17:32:43 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 17:32:43 +0000 |
commit | 6bf0a5cb5034a7e684dcc3500e841785237ce2dd (patch) | |
tree | a68f146d7fa01f0134297619fbe7e33db084e0aa /gfx/skia/patches/archive/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch | |
parent | Initial commit. (diff) | |
download | thunderbird-6bf0a5cb5034a7e684dcc3500e841785237ce2dd.tar.xz thunderbird-6bf0a5cb5034a7e684dcc3500e841785237ce2dd.zip |
Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx/skia/patches/archive/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch')
-rw-r--r-- | gfx/skia/patches/archive/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gfx/skia/patches/archive/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch b/gfx/skia/patches/archive/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch new file mode 100644 index 0000000000..aff99f75f1 --- /dev/null +++ b/gfx/skia/patches/archive/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch @@ -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)))) |