From 4149d576c3d9d23d6fee18d9dd346d02a03fa93f Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 3 Mar 2004 19:19:36 +0000 Subject: [PATCH] 22004-03-03 Martin Fuchs * include/oleauto.h (V_UNION, V_VT, V_DECIMAL): Use __VARIANT_NAME_ constants. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/oleauto.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 8a059c220..070826558 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2004-03-03 Martin Fuchs + + * include/oleauto.h (V_UNION, V_VT, V_DECIMAL): Use + __VARIANT_NAME_ constants. + 2004-03-02 Danny Smith * include/uxtheme.h: Include diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h index 672579e12..7c9405a18 100644 --- a/winsup/w32api/include/oleauto.h +++ b/winsup/w32api/include/oleauto.h @@ -38,8 +38,8 @@ #define ACTIVEOBJECT_STRONG 0 #define ACTIVEOBJECT_WEAK 1 #ifdef NONAMELESSUNION -#define V_UNION(X,Y) ((X)->n1.n2.n3.Y) -#define V_VT(X) ((X)->n1.n2.vt) +#define V_UNION(X,Y) ((X)->__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.Y) +#define V_VT(X) ((X)->__VARIANT_NAME_1.__VARIANT_NAME_2.vt) #else #define V_UNION(X,Y) ((X)->Y) #define V_VT(X) ((X)->vt) @@ -93,7 +93,7 @@ #define V_ARRAYREF(X) V_UNION(X,pparray) #define V_BYREF(X) V_UNION(X,byref) #if defined(NONAMELESSUNION) -#define V_DECIMAL(X) ((X)->n1.decVal) +#define V_DECIMAL(X) ((X)->__VARIANT_NAME_1.decVal) #else #define V_DECIMAL(X) ((X)->decVal) #endif -- 2.43.5