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

	* include/oleauto.h (V_UNION, V_VT, V_DECIMAL): Use
	__VARIANT_NAME_ constants.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8a059c2207b065912f9648d4bad7efe93dadef47..070826558aa7562cb90b512ff9dcd070239b579e 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -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>
 
        * include/uxtheme.h: Include <commctrl.h>

diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h
index 672579e12c4335a0570f6656cf1782d8a7bc8cee..7c9405a183106380f0b5961a10e1f942d452652a 100644 (file)
--- 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