From e299c7addc3ec7f20162a54740dc06cae2a71389 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 3 Mar 2004 20:24:08 +0000 Subject: [PATCH] * include/wtypes.h (DECIMAL_SETZERO): Add definition for NONAMELESSUNION case. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/wtypes.h | 4 ++++ 2 files changed, 9 insertions(+) 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 + + * include/wtypes.h (DECIMAL_SETZERO): Add definition for + NONAMELESSUNION case. + 2004-03-03 Martin Fuchs * 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