diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/prsht.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index c8adea6be..d8eac3a35 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,10 @@ 2003-05-13 Danny Smith <dannysmith@users.sourceforge.net> + * include/prsht.h (PROPSHEETHEADER[AW]: Mark + anonymous unions as GCC extension. + +2003-05-13 Danny Smith <dannysmith@users.sourceforge.net> + * include/oleidl.h (LPENUMOLEDOCUMENTVIEWS): Remove typedef. (IEnumOleDocumentViews): Remove commented out DECLARE_ENUMERATOR. * include/docobj.h (LPENUMOLEDOCUMENTVIEWS): Add typedef (previously diff --git a/winsup/w32api/include/prsht.h b/winsup/w32api/include/prsht.h index 7b5fb036b..73432dfb6 100644 --- a/winsup/w32api/include/prsht.h +++ b/winsup/w32api/include/prsht.h @@ -185,12 +185,12 @@ typedef struct _PROPSHEETHEADERA { }DUMMYUNIONNAME3; PFNPROPSHEETCALLBACK pfnCallback; #if (_WIN32_IE >= 0x0400) - union { + _ANONYMOUS_UNION union { HBITMAP hbmWatermark; LPCSTR pszbmWatermark; } DUMMYUNIONNAME4; HPALETTE hplWatermark; - union { + _ANONYMOUS_UNION union { HBITMAP hbmHeader; LPCSTR pszbmHeader; } DUMMYUNIONNAME5; @@ -218,12 +218,12 @@ typedef struct _PROPSHEETHEADERW { }DUMMYUNIONNAME3; PFNPROPSHEETCALLBACK pfnCallback; #if (_WIN32_IE >= 0x0400) - union { + _ANONYMOUS_UNION union { HBITMAP hbmWatermark; LPCWSTR pszbmWatermark; } DUMMYUNIONNAME4; HPALETTE hplWatermark; - union { + _ANONYMOUS_UNION union { HBITMAP hbmHeader; LPCWSTR pszbmHeader; } DUMMYUNIONNAME5; |