22004-03-03 Martin Fuchs <martin-fuchs@gmx.net>

* include/oleauto.h (V_UNION, V_VT, V_DECIMAL): Use
	__VARIANT_NAME_ constants.
This commit is contained in:
Danny Smith 2004-03-03 19:19:36 +00:00
parent f9ef90e3ab
commit 4149d576c3
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2004-03-03 Martin Fuchs <martin-fuchs@gmx.net>
* include/oleauto.h (V_UNION, V_VT, V_DECIMAL): Use
__VARIANT_NAME_ constants.
2004-03-02 Danny Smith <dannysmith@users.sourceforge.net> 2004-03-02 Danny Smith <dannysmith@users.sourceforge.net>
* include/uxtheme.h: Include <commctrl.h> * include/uxtheme.h: Include <commctrl.h>

View File

@ -38,8 +38,8 @@
#define ACTIVEOBJECT_STRONG 0 #define ACTIVEOBJECT_STRONG 0
#define ACTIVEOBJECT_WEAK 1 #define ACTIVEOBJECT_WEAK 1
#ifdef NONAMELESSUNION #ifdef NONAMELESSUNION
#define V_UNION(X,Y) ((X)->n1.n2.n3.Y) #define V_UNION(X,Y) ((X)->__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.Y)
#define V_VT(X) ((X)->n1.n2.vt) #define V_VT(X) ((X)->__VARIANT_NAME_1.__VARIANT_NAME_2.vt)
#else #else
#define V_UNION(X,Y) ((X)->Y) #define V_UNION(X,Y) ((X)->Y)
#define V_VT(X) ((X)->vt) #define V_VT(X) ((X)->vt)
@ -93,7 +93,7 @@
#define V_ARRAYREF(X) V_UNION(X,pparray) #define V_ARRAYREF(X) V_UNION(X,pparray)
#define V_BYREF(X) V_UNION(X,byref) #define V_BYREF(X) V_UNION(X,byref)
#if defined(NONAMELESSUNION) #if defined(NONAMELESSUNION)
#define V_DECIMAL(X) ((X)->n1.decVal) #define V_DECIMAL(X) ((X)->__VARIANT_NAME_1.decVal)
#else #else
#define V_DECIMAL(X) ((X)->decVal) #define V_DECIMAL(X) ((X)->decVal)
#endif #endif