fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-23 09:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/xwin: Fix for MinGW-w64 DirectDraw headers

Browse source 
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:
Yaakov Selkowitz 2012-11-09 12:19:31 -06:00 • committed by Jon TURNEY
parent fb170498ab
commit 338bec3005
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/xwin/ddraw.h
View file

@ -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

2
hw/xwin/win.h
View file

@ -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>

1
hw/xwin/winms.h
View file

@ -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