From bc26bdea7cd58436eedd5ed32edc721b3f0eb023 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 May 2011 12:32:19 +0200
Subject: [PATCH] include: Undefine the nameless union/struct macros to avoid
 conflicts with mingw.

---
 include/winnt.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/include/winnt.h b/include/winnt.h
index 62d5f80fa28..b4aa5a071a1 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -192,6 +192,12 @@ extern "C" {
 # endif
 #endif  /* NONAMELESSUNION */
 
+#undef DUMMYSTRUCTNAME
+#undef DUMMYSTRUCTNAME1
+#undef DUMMYSTRUCTNAME2
+#undef DUMMYSTRUCTNAME3
+#undef DUMMYSTRUCTNAME4
+#undef DUMMYSTRUCTNAME5
 #ifndef NONAMELESSSTRUCT
 #define DUMMYSTRUCTNAME
 #define DUMMYSTRUCTNAME1
@@ -208,6 +214,15 @@ extern "C" {
 #define DUMMYSTRUCTNAME5  s5
 #endif /* !defined(NONAMELESSSTRUCT) */
 
+#undef DUMMYUNIONNAME
+#undef DUMMYUNIONNAME1
+#undef DUMMYUNIONNAME2
+#undef DUMMYUNIONNAME3
+#undef DUMMYUNIONNAME4
+#undef DUMMYUNIONNAME5
+#undef DUMMYUNIONNAME6
+#undef DUMMYUNIONNAME7
+#undef DUMMYUNIONNAME8
 #ifndef NONAMELESSUNION
 #define DUMMYUNIONNAME
 #define DUMMYUNIONNAME1