From d636446e3077d4c2339715a8b9bfd3c845620588 Mon Sep 17 00:00:00 2001
From: Adrian Thurston <adriant@COREL.CA>
Date: Thu, 25 Feb 1999 16:34:13 +0000
Subject: [PATCH] Adds C++ nameless union support to tagVARIANT.

---
 include/wine/obj_oleaut.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/wine/obj_oleaut.h b/include/wine/obj_oleaut.h
index eea0a5729c8..d753ed9bd2f 100644
--- a/include/wine/obj_oleaut.h
+++ b/include/wine/obj_oleaut.h
@@ -137,15 +137,22 @@ enum VARENUM {
  * DISP_E_ARRAYISLOCKED : The variant contains an array that is locked.
  */
 
-typedef struct tagVARIANT VARIANT;
-typedef struct tagVARIANT VARIANTARG;
+#ifdef __cplusplus
+#define _wine_tagVARIANT_UNION_NAME 
+#else
+#define _wine_tagVARIANT_UNION_NAME u
+#endif
+/* end FIXME */
+
+typedef struct tagVARIANT VARIANT, *LPVARIANT;
+typedef struct tagVARIANT VARIANTARG, *LPVARIANTARG;
 
 struct tagVARIANT {
 	VARTYPE vt;
 	WORD wReserved1;
 	WORD wReserved2;
 	WORD wReserved3;
-	union
+  union _wine_tagVARIANT_UNION_NAME 
 	{
 		/* By value.
 		 */
@@ -196,7 +203,7 @@ struct tagVARIANT {
 		IDispatch** ppdispVal;
         SAFEARRAY** pparray;
         */
-	} u;
+  } _wine_tagVARIANT_UNION_NAME;
 };
 
 typedef LONG DISPID;