* include/prsht.h (PROPSHEETHEADER[AW]: Mark

anonymous unions as GCC extension.
This commit is contained in:
Danny Smith 2003-05-13 10:53:13 +00:00
parent 8a4b4764b8
commit 1b89c1742e
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
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> 2003-05-13 Danny Smith <dannysmith@users.sourceforge.net>
* include/oleidl.h (LPENUMOLEDOCUMENTVIEWS): Remove typedef. * include/oleidl.h (LPENUMOLEDOCUMENTVIEWS): Remove typedef.

View File

@ -185,12 +185,12 @@ typedef struct _PROPSHEETHEADERA {
}DUMMYUNIONNAME3; }DUMMYUNIONNAME3;
PFNPROPSHEETCALLBACK pfnCallback; PFNPROPSHEETCALLBACK pfnCallback;
#if (_WIN32_IE >= 0x0400) #if (_WIN32_IE >= 0x0400)
union { _ANONYMOUS_UNION union {
HBITMAP hbmWatermark; HBITMAP hbmWatermark;
LPCSTR pszbmWatermark; LPCSTR pszbmWatermark;
} DUMMYUNIONNAME4; } DUMMYUNIONNAME4;
HPALETTE hplWatermark; HPALETTE hplWatermark;
union { _ANONYMOUS_UNION union {
HBITMAP hbmHeader; HBITMAP hbmHeader;
LPCSTR pszbmHeader; LPCSTR pszbmHeader;
} DUMMYUNIONNAME5; } DUMMYUNIONNAME5;
@ -218,12 +218,12 @@ typedef struct _PROPSHEETHEADERW {
}DUMMYUNIONNAME3; }DUMMYUNIONNAME3;
PFNPROPSHEETCALLBACK pfnCallback; PFNPROPSHEETCALLBACK pfnCallback;
#if (_WIN32_IE >= 0x0400) #if (_WIN32_IE >= 0x0400)
union { _ANONYMOUS_UNION union {
HBITMAP hbmWatermark; HBITMAP hbmWatermark;
LPCWSTR pszbmWatermark; LPCWSTR pszbmWatermark;
} DUMMYUNIONNAME4; } DUMMYUNIONNAME4;
HPALETTE hplWatermark; HPALETTE hplWatermark;
union { _ANONYMOUS_UNION union {
HBITMAP hbmHeader; HBITMAP hbmHeader;
LPCWSTR pszbmHeader; LPCWSTR pszbmHeader;
} DUMMYUNIONNAME5; } DUMMYUNIONNAME5;