vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Oct 10 15:23:03 2018 +0200| [2645e85ea21e5c4b595db162465898b49e6d1611] | committer: Hugo Beauzée-Luyssen
qt: Include vlc_xlib last Xlib.h provides some macros which conflict with some of Qt symbols > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2645e85ea21e5c4b595db162465898b49e6d1611 --- modules/gui/qt/qt.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp index 6fdbda06fa..cde1134f9c 100644 --- a/modules/gui/qt/qt.cpp +++ b/modules/gui/qt/qt.cpp @@ -62,9 +62,6 @@ extern "C" char **environ; #include <vlc_plugin.h> #include <vlc_vout_window.h> -#ifndef X_DISPLAY_MISSING -# include <vlc_xlib.h> -#endif #ifdef _WIN32 /* For static builds */ #include <QtPlugin> @@ -82,6 +79,10 @@ extern "C" char **environ; #endif #endif +#ifndef X_DISPLAY_MISSING +# include <vlc_xlib.h> +#endif + /***************************************************************************** * Local prototypes. *****************************************************************************/ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
