From 2f22c76db18db0b6b360ebf1b406c81196ef3a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 14 Apr 2018 16:48:49 +0200 Subject: UICommon: Avoid including Xrandr.h Xlib has really terrible headers that declare non-namespaced macros and typedefs for common words. Just wasted 10 minutes trying to figure out why a unit test failed to build before I remembered it was Xrandr.h conflicting with our enum class members again. To fix the issue, this removes the Display* parameter from the EnableScreensaver function (which was unused) so we don't have to include Xrandr.h anymore. --- Source/Core/DolphinNoGUI/MainNoGUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DolphinNoGUI/MainNoGUI.cpp') diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index def748832f..0d7a84137e 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -191,7 +191,7 @@ class PlatformX11 : public Platform s_window_handle = (void*)win; if (SConfig::GetInstance().bDisableScreenSaver) - X11Utils::InhibitScreensaver(dpy, win, true); + X11Utils::InhibitScreensaver(win, true); #if defined(HAVE_XRANDR) && HAVE_XRANDR XRRConfig = new X11Utils::XRRConfiguration(dpy, win); -- cgit v1.2.3