From: Yaakov Selkowitz <yselkow...@users.sourceforge.net> mingw-w64 headers handle NONAMELESSUNION earlier than mingw.org's, so it must be defined before including any headers. It also provides a ddraw.h, so use it.
Signed-off-by: Yaakov Selkowitz <yselkow...@users.sourceforge.net> Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk> --- hw/xwin/ddraw.h | 4 ++++ hw/xwin/win.h | 2 ++ hw/xwin/winms.h | 1 - 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index 9463049..1871d95 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -1,3 +1,7 @@ +#ifdef __MINGW64_VERSION_MAJOR +#include_next <ddraw.h> +#define __XWIN_DDRAW_H +#endif #ifndef __XWIN_DDRAW_H #define __XWIN_DDRAW_H diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 7b34e84..6c524f9 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -133,6 +133,8 @@ #define WIN_MAX_KEYS_PER_KEY 4 +#define NONAMELESSUNION + #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index 5282fc9..32923e5 100644 --- a/hw/xwin/winms.h +++ b/hw/xwin/winms.h @@ -30,7 +30,6 @@ * Authors: Harold L Hunt II */ -#define NONAMELESSUNION #define DIRECTDRAW_VERSION 0x0300 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN -- 1.7.9 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
