Module: wine Branch: master Commit: bc26bdea7cd58436eedd5ed32edc721b3f0eb023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc26bdea7cd58436eedd5ed32e...
Author: Alexandre Julliard julliard@winehq.org Date: Mon May 23 12:32:19 2011 +0200
include: Undefine the nameless union/struct macros to avoid conflicts with mingw.
---
include/winnt.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/include/winnt.h b/include/winnt.h index 62d5f80..b4aa5a0 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