From 80ac7b1f9ac10f86232594baf996347bede5923d Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 23 Jul 2002 02:09:27 +0000 Subject: [PATCH] * include/oleauto.h (V_BOOL): Define in terms of boolVal, not bool, for C as well as C++. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/oleauto.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 72af7a22e..fbcd75f21 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2002-07-23 Danny Smith + + * include/oleauto.h (V_BOOL): Define in terms of boolVal, + not bool, for C as well as C++. + 2002-07-22 Danny Smith * include/shlwapi.h: New file. diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h index ab519ab28..fa4d7ee55 100644 --- a/winsup/w32api/include/oleauto.h +++ b/winsup/w32api/include/oleauto.h @@ -32,11 +32,7 @@ #else #define V_UNION(X,Y) ((X)->Y) #endif -#ifdef __cplusplus #define V_BOOL(X) V_UNION(X,boolVal) -#else -#define V_BOOL(X) V_UNION(X,bool) -#endif #define V_VT(X) ((X)->vt) #define V_ISBYREF(X) (V_VT(X)&VT_BYREF) #define V_ISARRAY(X) (V_VT(X)&VT_ARRAY)