diff options
| author | JMC47 <JMC4789@gmail.com> | 2021-03-07 00:21:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 00:21:11 -0500 |
| commit | 089250fde65c2e225681c0ef6917d28fa187e8de (patch) | |
| tree | bcbb6db025c6003bd681e0028f0bc3b7b223bd07 /Source/Core/DolphinNoGUI/PlatformX11.cpp | |
| parent | 5f7d935b0a40f5cece7341927bd92b6a8d5debbe (diff) | |
| parent | df81210e96c6603d3aeb6c76f51b030d06cd06ac (diff) | |
Merge pull request #9497 from Pokechu22/better-fifo-analyzer
Graphics refactoring + add names and descriptions in FIFO analyzer
Diffstat (limited to 'Source/Core/DolphinNoGUI/PlatformX11.cpp')
| -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 |