summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog5
-rw-r--r--winsup/w32api/include/objidl.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 3d376d8cb..e5deb6aaf 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,10 @@
2002-06-24 Danny Smith <dannysmith@users.sourceforge.net>
+ * include/objidl.h (struct tagPROPVARIANT): Kill obsolete
+ union member _VARIANT_BOOL bool.
+
+2002-06-24 Danny Smith <dannysmith@users.sourceforge.net>
+
* include/winioctl.h (FILE_SPECIAL_ACCESS): Add define.
2002-06-24 Casper S. Hornstrup <chorns@users.sourceforge.net>
diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h
index dfabbee18..20f5cd8cc 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;