mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-02 14:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DolphinNoGUI/PlatformX11: Work around X.h's None being undefined

Browse source
This commit is contained in:
Pokechu22 2021-02-11 22:48:46 -08:00
commit d702f3b4ad
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Core/DolphinNoGUI/PlatformX11.cpp
View file

@ -4,6 +4,12 @@
#include <unistd.h> #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 "DolphinNoGUI/Platform.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
@ -47,7 +53,7 @@ private:
Display* m_display = nullptr; Display* m_display = nullptr;
Window m_window = {}; Window m_window = {};
Cursor m_blank_cursor = None; Cursor m_blank_cursor = X_None;
#ifdef HAVE_XRANDR #ifdef HAVE_XRANDR
X11Utils::XRRConfiguration* m_xrr_config = nullptr; X11Utils::XRRConfiguration* m_xrr_config = nullptr;
#endif #endif