And some more of them.

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1408 4407c894-4637-0410-b4f5-ada5f102cad1
This commit is contained in:
Kai Tietz 2009-09-21 09:05:31 +00:00
parent 46f927b9c5
commit 48eab32a5c
9 changed files with 27 additions and 27 deletions

View File

@ -820,7 +820,7 @@ extern "C" {
typedef struct _NDIS_802_11_TEST {
ULONG Length;
ULONG Type;
union {
__MINGW_EXTENSION union {
NDIS_802_11_AUTHENTICATION_EVENT AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
};
@ -1222,7 +1222,7 @@ extern "C" {
typedef struct _NDIS_GUID {
GUID Guid;
union {
__MINGW_EXTENSION union {
NDIS_OID Oid;
NDIS_STATUS Status;
};

View File

@ -94,7 +94,7 @@ typedef struct tagFONTDESC {
typedef struct tagPICTDESC {
UINT cbSizeofstruct;
UINT picType;
union {
__MINGW_EXTENSION union {
struct {
HBITMAP hbitmap;
HPALETTE hpal;

View File

@ -531,16 +531,16 @@ extern "C" {
#ifndef DECIMAL_SETZERO
typedef struct tagDEC {
USHORT wReserved;
union {
struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
BYTE scale;
BYTE sign;
};
USHORT signscale;
};
ULONG Hi32;
union {
struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
ULONG Lo32;
ULONG Mid32;
};

View File

@ -17,8 +17,8 @@
typedef unsigned long DBKIND;
enum DBKINDENUM {
DBKIND_GUID_NAME = 0,DBKIND_GUID_PROPID = DBKIND_GUID_NAME + 1,DBKIND_NAME = DBKIND_GUID_PROPID + 1,DBKIND_PGUID_NAME = DBKIND_NAME + 1,
DBKIND_PGUID_PROPID = DBKIND_PGUID_NAME + 1,DBKIND_PROPID = DBKIND_PGUID_PROPID + 1,DBKIND_GUID = DBKIND_PROPID + 1
DBKIND_GUID_NAME = 0,DBKIND_GUID_PROPID,DBKIND_NAME,DBKIND_PGUID_NAME,
DBKIND_PGUID_PROPID,DBKIND_PROPID,DBKIND_GUID
};
typedef struct tagDBID {

View File

@ -99,7 +99,7 @@ extern "C" {
typedef struct _PATCH_OLD_FILE_INFO {
ULONG SizeOfThisStruct;
union {
__MINGW_EXTENSION union {
LPCSTR OldFileNameA;
LPCWSTR OldFileNameW;
HANDLE OldFileHandle;

View File

@ -72,7 +72,7 @@ extern "C" {
typedef struct _PDH_FMT_COUNTERVALUE {
DWORD CStatus;
union {
__MINGW_EXTENSION union {
LONG longValue;
double doubleValue;
LONGLONG largeValue;
@ -141,10 +141,10 @@ extern "C" {
DWORD_PTR dwUserData;
DWORD_PTR dwQueryUserData;
LPSTR szFullPath;
union {
__MINGW_EXTENSION union {
PDH_DATA_ITEM_PATH_ELEMENTS_A DataItemPath;
PDH_COUNTER_PATH_ELEMENTS_A CounterPath;
struct {
__MINGW_EXTENSION struct {
LPSTR szMachineName;
LPSTR szObjectName;
LPSTR szInstanceName;
@ -167,10 +167,10 @@ extern "C" {
DWORD_PTR dwUserData;
DWORD_PTR dwQueryUserData;
LPWSTR szFullPath;
union {
__MINGW_EXTENSION union {
PDH_DATA_ITEM_PATH_ELEMENTS_W DataItemPath;
PDH_COUNTER_PATH_ELEMENTS_W CounterPath;
struct {
__MINGW_EXTENSION struct {
LPWSTR szMachineName;
LPWSTR szObjectName;
LPWSTR szInstanceName;
@ -205,8 +205,8 @@ extern "C" {
LPSTR szBaseFileName;
DWORD dwFileType;
DWORD dwReserved;
union {
struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
DWORD PdlAutoNameInterval;
DWORD PdlAutoNameUnits;
LPSTR PdlCommandFilename;
@ -216,7 +216,7 @@ extern "C" {
FILETIME PdlLogStartTime;
FILETIME PdlLogEndTime;
};
struct {
__MINGW_EXTENSION struct {
DWORD TlNumberOfBuffers;
DWORD TlMinimumBuffers;
DWORD TlMaximumBuffers;
@ -240,8 +240,8 @@ extern "C" {
LPWSTR szBaseFileName;
DWORD dwFileType;
DWORD dwReserved;
union {
struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
DWORD PdlAutoNameInterval;
DWORD PdlAutoNameUnits;
LPWSTR PdlCommandFilename;
@ -251,7 +251,7 @@ extern "C" {
FILETIME PdlLogStartTime;
FILETIME PdlLogEndTime;
};
struct {
__MINGW_EXTENSION struct {
DWORD TlNumberOfBuffers;
DWORD TlMinimumBuffers;
DWORD TlMaximumBuffers;

View File

@ -58,7 +58,7 @@ typedef enum {
typedef struct _RSVP_FILTERSPEC {
FilterType Type;
union {
__MINGW_EXTENSION union {
RSVP_FILTERSPEC_V4 FilterSpecV4;
RSVP_FILTERSPEC_V6 FilterSpecV6;
RSVP_FILTERSPEC_V6_FLOW FilterSpecV6Flow;
@ -151,7 +151,7 @@ typedef struct _CONTROL_SERVICE {
ULONG Length;
SERVICETYPE Service;
AD_GENERAL_PARAMS Overrides;
union {
__MINGW_EXTENSION union {
AD_GUARANTEED Guaranteed;
PARAM_BUFFER ParamBuffer[1];
};

View File

@ -82,7 +82,7 @@ extern "C" {
typedef struct CLRES_FUNCTION_TABLE {
DWORD TableSize;
DWORD Version;
union {
__MINGW_EXTENSION union {
CLRES_V1_FUNCTIONS V1Functions;
};
} CLRES_FUNCTION_TABLE,*PCLRES_FUNCTION_TABLE;
@ -111,7 +111,7 @@ extern "C" {
LPWSTR Name;
LPWSTR KeyName;
DWORD Format;
union {
__MINGW_EXTENSION union {
DWORD_PTR DefaultPtr;
DWORD Default;
LPVOID lpDefault;

View File

@ -152,8 +152,8 @@ extern "C" {
#define RTM_NEXTHOP_FLAGS_DOWN 0x0002
typedef struct _RTM_ENTITY_ID {
union {
struct {
__MINGW_EXTENSION union {
__MINGW_EXTENSION struct {
ULONG EntityProtocolId;
ULONG EntityInstanceId;
};