ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4877 from ligfx/forward_declare_xlib 

Remove include X11/Xlib.h from X11Utils.h
This commit is contained in:
Anthony 2017-02-23 13:17:37 -08:00 committed by GitHub
parent ecb7d01347 88f7056a41
commit 27a5e33b92
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/X11Utils.h
View File

@ -4,19 +4,10 @@
#pragma once #pragma once
// HACK: Xlib.h (included from gtk/gdk headers and directly) uses #defines on
// common names such as "Status", "BadRequest" or "Response", causing SFML
// headers to be completely broken.
//
// We work around that issue by including SFML first before X11 headers. This
// is terrible, but such is the life with Xlib.
#include <SFML/Network.hpp> // NOLINT
#if defined(HAVE_XRANDR) && HAVE_XRANDR #if defined(HAVE_XRANDR) && HAVE_XRANDR
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>
#endif #endif
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h>
// EWMH state actions, see // EWMH state actions, see
// http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec // http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec