diff options
| author | Pokechu22 <Pokechu022@gmail.com> | 2021-02-11 22:48:46 -0800 |
|---|---|---|
| committer | Pokechu22 <Pokechu022@gmail.com> | 2021-03-06 17:34:04 -0800 |
| commit | d702f3b4ad803735d9bb709ef050ba5ebc35b1db (patch) | |
| tree | 29e00e7191d74dc1cc10dfaf7c3d84da42c89be0 /Source/Core | |
| parent | f697e17dd1005eeea172f6a34497cae47bdfc8d6 (diff) | |
DolphinNoGUI/PlatformX11: Work around X.h's None being undefined
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinNoGUI/PlatformX11.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp index b44620a048..f09a16ba1a 100644 --- a/Source/Core/DolphinNoGUI/PlatformX11.cpp +++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp @@ -4,6 +4,12 @@ #include <unistd.h> +// X.h defines None to be 0L, but other parts of Dolphin undef that so that +// None can be used in enums. Work around that here by copying the definition +// before it is undefined. +#include <X11/X.h> +static constexpr auto X_None = None; + #include "DolphinNoGUI/Platform.h" #include "Common/MsgHandler.h" @@ -47,7 +53,7 @@ private: Display* m_display = nullptr; Window m_window = {}; - Cursor m_blank_cursor = None; + Cursor m_blank_cursor = X_None; #ifdef HAVE_XRANDR X11Utils::XRRConfiguration* m_xrr_config = nullptr; #endif |