diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-01 11:36:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 11:36:39 +0100 |
| commit | 858f00b6418538dcbbc552edecb4bbe152a7fd66 (patch) | |
| tree | 3ac7d7a2d667d6c60971ee33f6313d39bd35764e /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | 26f0bf8f34d5fcdeabc4a2a6d21f4a34c5430789 (diff) | |
| parent | d4b293e969341b630340f3d3c35e1c0d3edf4152 (diff) | |
Merge pull request #9492 from nolange/fix_norandr_build
Cleanup X11 and XRANDR Macros
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 67d02d042d..43dc09f9e9 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -119,7 +119,7 @@ #include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/VideoConfig.h" -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR #include "UICommon/X11Utils.h" // This #define within X11/X.h conflicts with our WiimoteSource enum. #undef None @@ -1174,7 +1174,7 @@ void MainWindow::ShowGraphicsWindow() { if (!m_graphics_window) { -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_XRANDR if (GetWindowSystemType() == WindowSystemType::X11) { m_xrr_config = std::make_unique<X11Utils::XRRConfiguration>( @@ -1465,7 +1465,7 @@ void MainWindow::UpdateScreenSaverInhibition() m_is_screensaver_inhibited = inhibit; -#if defined(HAVE_XRANDR) && HAVE_XRANDR +#ifdef HAVE_X11 if (GetWindowSystemType() == WindowSystemType::X11) UICommon::InhibitScreenSaver(winId(), inhibit); #else |