Adds C++ nameless union support to tagVARIANT.

This commit is contained in:
Adrian Thurston 1999-02-25 16:34:13 +00:00 committed by Alexandre Julliard
parent 975feaf0e7
commit d636446e30
1 changed files with 11 additions and 4 deletions

View File

@ -137,15 +137,22 @@ enum VARENUM {
* DISP_E_ARRAYISLOCKED : The variant contains an array that is locked. * DISP_E_ARRAYISLOCKED : The variant contains an array that is locked.
*/ */
typedef struct tagVARIANT VARIANT; #ifdef __cplusplus
typedef struct tagVARIANT VARIANTARG; #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 { struct tagVARIANT {
VARTYPE vt; VARTYPE vt;
WORD wReserved1; WORD wReserved1;
WORD wReserved2; WORD wReserved2;
WORD wReserved3; WORD wReserved3;
union union _wine_tagVARIANT_UNION_NAME
{ {
/* By value. /* By value.
*/ */
@ -196,7 +203,7 @@ struct tagVARIANT {
IDispatch** ppdispVal; IDispatch** ppdispVal;
SAFEARRAY** pparray; SAFEARRAY** pparray;
*/ */
} u; } _wine_tagVARIANT_UNION_NAME;
}; };
typedef LONG DISPID; typedef LONG DISPID;