diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-24 01:27:09 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-07-24 01:27:09 +0400 |
| commit | 5e50e4e45c1f8758d431a6d881cd3da5572e8de7 (patch) | |
| tree | 9763cc4d70e3666ab9cb351dce6c0c9a0404a272 /winsup/w32api | |
| parent | bc10065533261fbde738caea2096b2bac81a970b (diff) | |
* include/oleauto.h (V_UNION): Correct definition for case of
NONAMELESSUNION:
(V_VT): Likewise.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/oleauto.h | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index fbcd75f21..4e66ca7a6 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2002-07-24 Danny Smith <dannysmith@users.sourceforge.net> + + * include/oleauto.h (V_UNION): Correct definition for case of + NONAMELESSUNION: + (V_VT): Likewise. + 2002-07-23 Danny Smith <dannysmith@users.sourceforge.net> * include/oleauto.h (V_BOOL): Define in terms of boolVal, @@ -17,7 +23,7 @@ character. * include/winsock2.h (struct sockaddr): Use __int64 instead of long long. - * include/kernel32.c (GetCurrentFiber, GetFiberData): Watcom + * lib/kernel32.c (GetCurrentFiber, GetFiberData): Watcom does not need external *Fiber library functions. 2002-07-20 Casper S. Hornstrup <chorns@users.sourceforge.net> diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h index fa4d7ee55..3d651bd57 100644 --- a/winsup/w32api/include/oleauto.h +++ b/winsup/w32api/include/oleauto.h @@ -28,12 +28,13 @@ #define ACTIVEOBJECT_STRONG 0 #define ACTIVEOBJECT_WEAK 1 #ifdef NONAMELESSUNION -#define V_UNION(X,Y) ((X)->u.Y) +#define V_UNION(X,Y) ((X)->n1.n2.n3.Y) +#define V_VT(X) ((X)->n1.n2.vt) #else #define V_UNION(X,Y) ((X)->Y) +#define V_VT(X) ((X)->vt) #endif #define V_BOOL(X) V_UNION(X,boolVal) -#define V_VT(X) ((X)->vt) #define V_ISBYREF(X) (V_VT(X)&VT_BYREF) #define V_ISARRAY(X) (V_VT(X)&VT_ARRAY) #define V_ISVECTOR(X) (V_VT(X)&VT_VECTOR) |