From e241760c4542b26b3fca81d90916b29a6c8d7570 Mon Sep 17 00:00:00 2001 From: dannysmith Date: Mon, 24 Jun 2002 04:51:32 +0000 Subject: [PATCH] * include/objidl.h (struct tagPROPVARIANT): Kill obsolete union member _VARIANT_BOOL bool. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/objidl.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 3d376d8cb3..e5deb6aaf7 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 2002-06-24 Danny Smith + * include/objidl.h (struct tagPROPVARIANT): Kill obsolete + union member _VARIANT_BOOL bool. + +2002-06-24 Danny Smith + * include/winioctl.h (FILE_SPECIAL_ACCESS): Add define. 2002-06-24 Casper S. Hornstrup diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h index dfabbee185..20f5cd8cc8 100644 --- a/winsup/w32api/include/objidl.h +++ b/winsup/w32api/include/objidl.h @@ -305,7 +305,9 @@ typedef struct tagPROPVARIANT { short iVal; USHORT uiVal; VARIANT_BOOL boolVal; -#ifndef __cplusplus +#if 0 +/* bool is a standard type in C++, and a standard macro expanding + to the _Bool type in C99 (see stdbool.h) */ _VARIANT_BOOL bool; #endif long lVal; -- 2.11.0