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

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 <[email protected]> Reviewed-by: Colin Harrison <[email protected]>
juergbi · Nov 5, 2012 · a4941ce · a4941ce
1 parent 57bbf6e
commit a4941ce
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h
@@ -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