From 5e698a7b39cd8cd4549014421521addcd28761c1 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Thu, 13 Mar 2014 12:16:15 +1100 Subject: [PATCH] player/main: Fix Cygwin build Xlib.h (included from x11_common.h) defines a macro 'Status' as 'int'. This messed up a bunch of definitions in windows.h and broke the build in Cygwin. Including windows.h first seems to solve the problem. This commit also removes the definition of an unused flag. --- player/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/player/main.c b/player/main.c index bf97a39a3a..de88d0b817 100644 --- a/player/main.c +++ b/player/main.c @@ -67,6 +67,14 @@ #include "command.h" #include "screenshot.h" +#if defined(__MINGW32__) || defined(__CYGWIN__) +#include + +#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE +#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE (0x0001) +#endif +#endif + #if HAVE_X11 #include "video/out/x11_common.h" #endif @@ -79,18 +87,6 @@ #include #endif -#if defined(__MINGW32__) || defined(__CYGWIN__) -#include - -#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE -#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE (0x0001) -#endif - -#ifndef BASE_SEARCH_PATH_PERMANENT -#define BASE_SEARCH_PATH_PERMANENT (0x8000) -#endif -#endif - static bool terminal_initialized; const char mp_help_text[] =