summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog5
-rw-r--r--winsup/w32api/include/wtypes.h4
2 files changed, 9 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 070826558..9be431c22 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-02 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/wtypes.h (DECIMAL_SETZERO): Add definition for
+ NONAMELESSUNION case.
+
2004-03-03 Martin Fuchs <martin-fuchs@gmx.net>
* include/oleauto.h (V_UNION, V_VT, V_DECIMAL): Use
diff --git a/winsup/w32api/include/wtypes.h b/winsup/w32api/include/wtypes.h
index 85d1851a8..5192e1325 100644
--- a/winsup/w32api/include/wtypes.h
+++ b/winsup/w32api/include/wtypes.h
@@ -15,7 +15,11 @@ extern "C" {
#define CLSID_NULL GUID_NULL
#define CBPCLIPDATA(d) ((d).cbSize-sizeof((d).ulClipFmt))
#define DECIMAL_NEG ((BYTE)0x80)
+#ifdef NONAMELESSUNION
+#define DECIMAL_SETZERO(d) {(d).DUMMYUNIONNAME2.Lo64=(d).Hi32=(d).DUMMYUNIONNAME.signscale=0;}
+#else
#define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
+#endif
#define ROTFLAGS_REGISTRATIONKEEPSALIVE 0x01
#define ROTFLAGS_ALLOWANYCLIENT 0x02