andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin: Wrap 'Status' when including ddraw.h

Browse Source 
Status is #defined as an alias for a type in xkbsrv.h, which conflicts with it's
use as a parameter name in rpcdce.h

This fixes compilation with MinGW-w64 w32api headers

(The MinGW-w64 w32api headers actually provide a ddraw.h, so this fix tries to
do things in a way which will still work if our private copy of ddraw.h is
eventually removed)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by:  Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-08-21 15:31:16 +01:00
parent 57bbf6e2ae
commit a4941ce496
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xwin/winms.h
View File

@ -42,7 +42,11 @@
#include <X11/Xwindows.h>
#include <windowsx.h>
#pragma push_macro("Status")
#undef Status
#define Status wStatus
#include "ddraw.h"
#pragma pop_macro("Status")
#undef CreateWindow