hw/xwin: Fix for MinGW-w64 DirectDraw headers
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 <yselkowitz@users.sourceforge.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
fb170498ab
commit
338bec3005
|
@ -1,3 +1,7 @@
|
||||||
|
#ifdef __MINGW64_VERSION_MAJOR
|
||||||
|
#include_next <ddraw.h>
|
||||||
|
#define __XWIN_DDRAW_H
|
||||||
|
#endif
|
||||||
#ifndef __XWIN_DDRAW_H
|
#ifndef __XWIN_DDRAW_H
|
||||||
#define __XWIN_DDRAW_H
|
#define __XWIN_DDRAW_H
|
||||||
|
|
||||||
|
|
|
@ -133,6 +133,8 @@
|
||||||
|
|
||||||
#define WIN_MAX_KEYS_PER_KEY 4
|
#define WIN_MAX_KEYS_PER_KEY 4
|
||||||
|
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
* Authors: Harold L Hunt II
|
* Authors: Harold L Hunt II
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define DIRECTDRAW_VERSION 0x0300
|
#define DIRECTDRAW_VERSION 0x0300
|
||||||
#ifndef WIN32_LEAN_AND_MEAN
|
#ifndef WIN32_LEAN_AND_MEAN
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
|
Loading…
Reference in New Issue
Block a user