Guard unnamed struct/union by __MINGW_EXTENSION. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1407 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ks.h b/mingw-w64-headers/include/ks.h index e0fe66c..5a18fd5 100644 --- a/mingw-w64-headers/include/ks.h +++ b/mingw-w64-headers/include/ks.h
@@ -58,8 +58,8 @@ } KSPRIORITY,*PKSPRIORITY; typedef struct { - union { - struct + __MINGW_EXTENSION union { + __MINGW_EXTENSION struct #ifdef _KS_NO_ANONYMOUS_STRUCTURES_ _IDENTIFIER #endif @@ -151,7 +151,7 @@ } KSPROPERTY_MEMBERSHEADER,*PKSPROPERTY_MEMBERSHEADER; typedef union { - struct + __MINGW_EXTENSION struct #ifdef _KS_NO_ANONYMOUS_STRUCTURES_ _SIGNED #endif @@ -159,7 +159,7 @@ LONG SignedMinimum; LONG SignedMaximum; }; - struct + __MINGW_EXTENSION struct #ifdef _KS_NO_ANONYMOUS_STRUCTURES_ _UNSIGNED #endif @@ -170,7 +170,7 @@ } KSPROPERTY_BOUNDS_LONG,*PKSPROPERTY_BOUNDS_LONG; typedef union { - struct + __MINGW_EXTENSION struct #ifdef _KS_NO_ANONYMOUS_STRUCTURES_ _SIGNED64 #endif @@ -178,7 +178,7 @@ LONGLONG SignedMinimum; LONGLONG SignedMaximum; }; - struct + __MINGW_EXTENSION struct #ifdef _KS_NO_ANONYMOUS_STRUCTURES_ _UNSIGNED64 #endif @@ -203,7 +203,7 @@ typedef struct { ULONG NotificationType; - union { + __MINGW_EXTENSION union { struct { HANDLE Event; ULONG_PTR Reserved[2]; @@ -241,7 +241,7 @@ typedef struct { ULONG Size; ULONG Flags; - union { + __MINGW_EXTENSION union { HANDLE ObjectHandle; PVOID ObjectPointer; }; @@ -537,7 +537,7 @@ #define KSDATARANGE_REQUIRED_ATTRIBUTES (1 << KSDATARANGE_BIT_REQUIRED_ATTRIBUTES) typedef union { - struct { + __MINGW_EXTENSION struct { ULONG FormatSize; ULONG Flags; ULONG SampleSize; @@ -710,7 +710,7 @@ #define KSALLOCATOR_FLAG_ATTENTION_STEPPING 0x00002000 typedef struct { - union { + __MINGW_EXTENSION union { ULONG OptionsFlags; ULONG RequirementsFlags; };
diff --git a/mingw-w64-headers/include/ksmedia.h b/mingw-w64-headers/include/ksmedia.h index 56ad936..adb662e 100644 --- a/mingw-w64-headers/include/ksmedia.h +++ b/mingw-w64-headers/include/ksmedia.h
@@ -488,15 +488,15 @@ } KSAUDIO_POSITION,*PKSAUDIO_POSITION; typedef struct _DS3DVECTOR { - union { + __MINGW_EXTENSION union { FLOAT x; FLOAT dvX; }; - union { + __MINGW_EXTENSION union { FLOAT y; FLOAT dvY; }; - union { + __MINGW_EXTENSION union { FLOAT z; FLOAT dvZ; }; @@ -1923,7 +1923,7 @@ DWORD dwBitErrorRate; REFERENCE_TIME AvgTimePerFrame; KS_BITMAPINFOHEADER bmiHeader; - union { + __MINGW_EXTENSION union { KS_RGBQUAD bmiColors[KS_iPALETTE_COLORS]; DWORD dwBitMasks[KS_iMASK_COLORS]; KS_TRUECOLORINFO TrueColorInfo; @@ -3349,25 +3349,25 @@ DWORD dwSize; DWORD dwFlags; DWORD dwFourCC; - union { + __MINGW_EXTENSION union { DWORD dwRGBBitCount; DWORD dwYUVBitCount; DWORD dwZBufferBitDepth; DWORD dwAlphaBitDepth; }; - union { + __MINGW_EXTENSION union { DWORD dwRBitMask; DWORD dwYBitMask; }; - union { + __MINGW_EXTENSION union { DWORD dwGBitMask; DWORD dwUBitMask; }; - union { + __MINGW_EXTENSION union { DWORD dwBBitMask; DWORD dwVBitMask; }; - union { + __MINGW_EXTENSION union { DWORD dwRGBAlphaBitMask; DWORD dwYUVAlphaBitMask; DWORD dwRGBZBitMask;
diff --git a/mingw-w64-headers/include/mapiutil.h b/mingw-w64-headers/include/mapiutil.h index 3682bf7..ee458ed 100644 --- a/mingw-w64-headers/include/mapiutil.h +++ b/mingw-w64-headers/include/mapiutil.h
@@ -148,7 +148,7 @@ typedef struct { ULONG cctl; LPTSTR lpszResourceName; - union { + __MINGW_EXTENSION union { LPTSTR lpszComponent; ULONG ulItemID; };
diff --git a/mingw-w64-headers/include/msasn1.h b/mingw-w64-headers/include/msasn1.h index 02b656b..f3adac6 100644 --- a/mingw-w64-headers/include/msasn1.h +++ b/mingw-w64-headers/include/msasn1.h
@@ -139,7 +139,7 @@ typedef struct tagASN1open_t { ASN1uint32_t length; - union { + __MINGW_EXTENSION union { void *encoded; void *value; }; @@ -204,7 +204,7 @@ ASN1uint32_t cPDUs; const ASN1FreeFun_t *apfnFreeMemory; const ASN1uint32_t *acbStructSize; - union { + __MINGW_EXTENSION union { ASN1PerFunArr_t PER; ASN1BerFunArr_t BER; }; @@ -275,7 +275,7 @@ typedef struct tagASN1optionparam_t { ASN1option_e eOption; - union { + __MINGW_EXTENSION union { ASN1encodingrule_e eRule; ASN1uint32_t cbRequiredDecodedBufSize; struct {
diff --git a/mingw-w64-headers/include/msp.h b/mingw-w64-headers/include/msp.h index a7929ee..02adc61 100644 --- a/mingw-w64-headers/include/msp.h +++ b/mingw-w64-headers/include/msp.h
@@ -52,32 +52,32 @@ typedef long *MSP_HANDLE; typedef enum __MIDL___MIDL_itf_msp_0000_0001 { - ADDRESS_TERMINAL_AVAILABLE = 0,ADDRESS_TERMINAL_UNAVAILABLE = ADDRESS_TERMINAL_AVAILABLE + 1 + ADDRESS_TERMINAL_AVAILABLE = 0,ADDRESS_TERMINAL_UNAVAILABLE } MSP_ADDRESS_EVENT; typedef enum __MIDL___MIDL_itf_msp_0000_0002 { - CALL_NEW_STREAM = 0,CALL_STREAM_FAIL = CALL_NEW_STREAM + 1,CALL_TERMINAL_FAIL = CALL_STREAM_FAIL + 1, - CALL_STREAM_NOT_USED = CALL_TERMINAL_FAIL + 1,CALL_STREAM_ACTIVE = CALL_STREAM_NOT_USED + 1,CALL_STREAM_INACTIVE = CALL_STREAM_ACTIVE + 1 + CALL_NEW_STREAM = 0,CALL_STREAM_FAIL,CALL_TERMINAL_FAIL, + CALL_STREAM_NOT_USED,CALL_STREAM_ACTIVE,CALL_STREAM_INACTIVE } MSP_CALL_EVENT; typedef enum __MIDL___MIDL_itf_msp_0000_0003 { - CALL_CAUSE_UNKNOWN = 0,CALL_CAUSE_BAD_DEVICE = CALL_CAUSE_UNKNOWN + 1,CALL_CAUSE_CONNECT_FAIL = CALL_CAUSE_BAD_DEVICE + 1, - CALL_CAUSE_LOCAL_REQUEST = CALL_CAUSE_CONNECT_FAIL + 1,CALL_CAUSE_REMOTE_REQUEST = CALL_CAUSE_LOCAL_REQUEST + 1, - CALL_CAUSE_MEDIA_TIMEOUT = CALL_CAUSE_REMOTE_REQUEST + 1,CALL_CAUSE_MEDIA_RECOVERED = CALL_CAUSE_MEDIA_TIMEOUT + 1, - CALL_CAUSE_QUALITY_OF_SERVICE = CALL_CAUSE_MEDIA_RECOVERED + 1 + CALL_CAUSE_UNKNOWN = 0,CALL_CAUSE_BAD_DEVICE,CALL_CAUSE_CONNECT_FAIL, + CALL_CAUSE_LOCAL_REQUEST,CALL_CAUSE_REMOTE_REQUEST, + CALL_CAUSE_MEDIA_TIMEOUT,CALL_CAUSE_MEDIA_RECOVERED, + CALL_CAUSE_QUALITY_OF_SERVICE } MSP_CALL_EVENT_CAUSE; typedef enum __MIDL___MIDL_itf_msp_0000_0004 { - ME_ADDRESS_EVENT = 0,ME_CALL_EVENT = ME_ADDRESS_EVENT + 1,ME_TSP_DATA = ME_CALL_EVENT + 1,ME_PRIVATE_EVENT = ME_TSP_DATA + 1, - ME_ASR_TERMINAL_EVENT = ME_PRIVATE_EVENT + 1,ME_TTS_TERMINAL_EVENT = ME_ASR_TERMINAL_EVENT + 1,ME_FILE_TERMINAL_EVENT = ME_TTS_TERMINAL_EVENT + 1, - ME_TONE_TERMINAL_EVENT = ME_FILE_TERMINAL_EVENT + 1 + ME_ADDRESS_EVENT = 0,ME_CALL_EVENT,ME_TSP_DATA,ME_PRIVATE_EVENT, + ME_ASR_TERMINAL_EVENT,ME_TTS_TERMINAL_EVENT,ME_FILE_TERMINAL_EVENT, + ME_TONE_TERMINAL_EVENT } MSP_EVENT; typedef struct __MIDL___MIDL_itf_msp_0000_0005 { DWORD dwSize; MSP_EVENT Event; MSP_HANDLE hCall; - union { + __MINGW_EXTENSION union { struct { MSP_ADDRESS_EVENT Type; ITTerminal *pTerminal;
diff --git a/mingw-w64-headers/include/mssip.h b/mingw-w64-headers/include/mssip.h index 3db811b..11bf95f 100644 --- a/mingw-w64-headers/include/mssip.h +++ b/mingw-w64-headers/include/mssip.h
@@ -43,7 +43,7 @@ #define MSSIP_ADDINFO_CATMEMBER 2 #define MSSIP_ADDINFO_BLOB 3 #define MSSIP_ADDINFO_NONMSSIP 500 - union { + __MINGW_EXTENSION union { struct MS_ADDINFO_FLAT_ *psFlat; struct MS_ADDINFO_CATALOGMEMBER_ *psCatMember; struct MS_ADDINFO_BLOB_ *psBlob;
diff --git a/mingw-w64-headers/include/mswsock.h b/mingw-w64-headers/include/mswsock.h index 0d80caf..79ed691 100644 --- a/mingw-w64-headers/include/mswsock.h +++ b/mingw-w64-headers/include/mswsock.h
@@ -86,8 +86,8 @@ #define TP_ELEMENT_FILE 2 #define TP_ELEMENT_EOP 4 ULONG cLength; - union { - struct { + __MINGW_EXTENSION union { + __MINGW_EXTENSION struct { LARGE_INTEGER nFileOffset; HANDLE hFile; };