OSDN Git Service

* include/prsht.h (PROPSHEETHEADER[AW]: Mark
authordannysmith <dannysmith>
Tue, 13 May 2003 10:53:13 +0000 (10:53 +0000)
committerdannysmith <dannysmith>
Tue, 13 May 2003 10:53:13 +0000 (10:53 +0000)
anonymous unions as GCC extension.

winsup/w32api/ChangeLog
winsup/w32api/include/prsht.h

index c8adea6..d8eac3a 100644 (file)
@@ -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
index 7b5fb03..73432df 100644 (file)
@@ -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;