diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-11-30 09:04:00 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-11-30 11:18:35 +0100 |
| commit | cab4a0166a81749ba025be6e1ab39203bdee1e10 (patch) | |
| tree | ff9cc59c081f7990995ab261ac4967dc1af0cfc4 /vcl/inc/skia/x11 | |
| parent | 64ed0dcf6dbd9567ec33cd07ca8a15c63e86b9df (diff) | |
workaround gcc bug #55776 about enum class shadowing a global
GCC warns that 'enum class XorMode { None }' shadows 'constexpr int
None = 0' for a workaround for X11 headers, even though there's
no case for confusion here. So instead of a workaround for X11
headers work this around by placing the enum first, and then GCC
does not complain.
Change-Id: I3e7cfaced957d47dee8cc4f10ee74e8dd97a5cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126083
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/inc/skia/x11')
| -rw-r--r-- | vcl/inc/skia/x11/gdiimpl.hxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/inc/skia/x11/gdiimpl.hxx b/vcl/inc/skia/x11/gdiimpl.hxx index c2cb69649dab..f7198671b4d6 100644 --- a/vcl/inc/skia/x11/gdiimpl.hxx +++ b/vcl/inc/skia/x11/gdiimpl.hxx @@ -12,13 +12,9 @@ #include <vcl/dllapi.h> +#include <skia/gdiimpl.hxx> #include <unx/salgdi.h> #include <unx/x11/x11gdiimpl.h> -// X11 headers -constexpr int XNone = None; -#undef None -constexpr int None = XNone; -#include <skia/gdiimpl.hxx> class VCL_PLUGIN_PUBLIC X11SkiaSalGraphicsImpl final : public SkiaSalGraphicsImpl, public X11GraphicsImpl |