Skip to content

W
wine-winehq
Commit d636446e authored by Adrian Thurston's avatar Adrian Thurston Committed by Alexandre Julliard
Browse files
Options

Adds C++ nameless union support to tagVARIANT.

parent 975feaf0
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
include/wine/obj_oleaut.h
View file @ d636446e
...@@ -137,15 +137,22 @@ enum VARENUM { ...@@ -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 { ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment