Clean up warnings in ddk.
* include/ddk/atm.h (_ATM_AAL_OOB_INFO): Add _ANONYMOUS_UNION, conditional on __cplusplus. * include/ddk/scsi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT defines, throughout. (_CDB): Add _ANONYMOUS_UNION, conditional on __cplusplus. * include/ddk/cfg.h (_PNP_VETO_TYPE): Remove extra comma. * include/ddk/cfgmgr32.h: Change C++ comment style to ISO C. * include/ddk/ddkmapi.h (_DDLOCKOUT): Add _ANONYMOUS_UNION defines. * include/ddk/hidpi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT defines, throughout. * include/ddk/ndis.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT defines, throughout. Remove trailing semicolon from *_S 'structure' macro expansion, throughout. Remove trailing semicolon from DECLARE_UNKNOWN_STRUCT macro expansion. * include/ddk/ndiswan.h (_NDIS_WAN_COMPRESS_INFO): Add _ANONYMOUS_UNION. * include/ddk/ntapi.h (_PROCESS_DEVICEMAP_INFORMATION, _PROCESS_SESSION_INFORMATION): Add _ANONYMOUS_UNION. * include/ddk/ntddcdrm.h (CDROM_TOC_CD_TEXT_DATA_BLOCK): Add _ANONYMOUS_UNION. * include/ddk/ntdddisk.h: Add _ANONYMOUS_UNION, throughout. * include/ddk/ntddmou.h: Add _ANONYMOUS_UNION, throughout. * include/ddk/ntifs.h: Add _ANONYMOUS_UNION, throughout. (ZwQueryObject): Change 2nd param to OBJECT_INFORMATION_CLASS, to match proto in ntapi.h. (ZwSetInformationObject): Likewise. * include/ddk/srb.h (SCSI_REQUEST_BLOCK): Add _ANONYMOUS_UNION. (SCSI_ADAPTER_CONTROL_TYPE): Add __extension__. * include/ddk/tdikrnl.h (TDI20_CLIENT_INTERFACE_INFO): Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT. * include/ddk/usb.h (USB): Add _ANONYMOUS_UNION. * include/ddk/usbcamdi.h (USBCAMD_CamControlFlags): Remove last comma. * include/ddk/video.h (STATUS_BLOCK): Add _ANONYMOUS_UNION. * include/ddk/winddk.h (DECLARE_INTERNAL_OBJECT): Remove trailing semicolon when expanding macro. (GENERAL_LOOKASIDE_S): Likewise. Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT, throughout. Change inline to __inline, throughout. * include/ddk/winnt4.h: Change inline to __inline, throughout.
This commit is contained in:
Danny Smith
@ -433,10 +433,10 @@ typedef struct MediaSpecificInformation {
|
||||
} MEDIA_SPECIFIC_INFORMATION;
|
||||
|
||||
typedef struct _NDIS_PACKET_OOB_DATA {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
ULONGLONG TimeToSend;
|
||||
ULONGLONG TimeSent;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
ULONGLONG TimeReceived;
|
||||
UINT HeaderSize;
|
||||
UINT SizeMediaSpecificInfo;
|
||||
@ -759,7 +759,7 @@ typedef struct _CO_SAP {
|
||||
} CO_SAP, *PCO_SAP;
|
||||
|
||||
typedef struct _NDIS_IPSEC_PACKET_INFO {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
struct {
|
||||
NDIS_HANDLE OffloadHandle;
|
||||
NDIS_HANDLE NextOffloadHandle;
|
||||
@ -770,7 +770,7 @@ typedef struct _NDIS_IPSEC_PACKET_INFO {
|
||||
ULONG NEXT_CRYPTO_DONE : 1;
|
||||
ULONG CryptoStatus;
|
||||
} Receive;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} NDIS_IPSEC_PACKET_INFO, *PNDIS_IPSEC_PACKET_INFO;
|
||||
|
||||
/* NDIS_MAC_FRAGMENT.Errors constants */
|
||||
@ -800,7 +800,7 @@ typedef struct _NDIS_MAC_LINE_UP {
|
||||
} NDIS_MAC_LINE_UP, *PNDIS_MAC_LINE_UP;
|
||||
|
||||
typedef struct _NDIS_PACKET_8021Q_INFO {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
struct {
|
||||
UINT32 UserPriority : 3;
|
||||
UINT32 CanonicalFormatId : 1;
|
||||
@ -808,7 +808,7 @@ typedef struct _NDIS_PACKET_8021Q_INFO {
|
||||
UINT32 Reserved : 16;
|
||||
} TagHeader;
|
||||
PVOID Value;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} NDIS_PACKET_8021Q_INFO, *PNDIS_PACKET_8021Q_INFO;
|
||||
|
||||
typedef enum _NDIS_PER_PACKET_INFO {
|
||||
@ -988,7 +988,7 @@ typedef struct _NDIS_TASK_TCP_LARGE_SEND {
|
||||
} NDIS_TASK_TCP_LARGE_SEND, *PNDIS_TASK_TCP_LARGE_SEND;
|
||||
|
||||
typedef struct _NDIS_TCP_IP_CHECKSUM_PACKET_INFO {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
struct {
|
||||
ULONG NdisPacketChecksumV4 : 1;
|
||||
ULONG NdisPacketChecksumV6 : 1;
|
||||
@ -1007,7 +1007,7 @@ typedef struct _NDIS_TCP_IP_CHECKSUM_PACKET_INFO {
|
||||
ULONG NdisPacketLoopback : 1;
|
||||
} Receive;
|
||||
ULONG Value;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} NDIS_TCP_IP_CHECKSUM_PACKET_INFO, *PNDIS_TCP_IP_CHECKSUM_PACKET_INFO;
|
||||
|
||||
typedef struct _NDIS_WAN_CO_FRAGMENT {
|
||||
@ -1347,33 +1347,33 @@ typedef VOID DDKAPI
|
||||
#define NDIS30_PROTOCOL_CHARACTERISTICS_S \
|
||||
UCHAR MajorNdisVersion; \
|
||||
UCHAR MinorNdisVersion; \
|
||||
union { \
|
||||
_ANONYMOUS_UNION union { \
|
||||
UINT Reserved; \
|
||||
UINT Flags; \
|
||||
}; \
|
||||
} DUMMYUNIONNAME; \
|
||||
OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; \
|
||||
CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; \
|
||||
union { \
|
||||
_ANONYMOUS_UNION union { \
|
||||
SEND_COMPLETE_HANDLER SendCompleteHandler; \
|
||||
WAN_SEND_COMPLETE_HANDLER WanSendCompleteHandler; \
|
||||
}; \
|
||||
union { \
|
||||
} DUMMYUNIONNAME2; \
|
||||
_ANONYMOUS_UNION union { \
|
||||
TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \
|
||||
WAN_TRANSFER_DATA_COMPLETE_HANDLER WanTransferDataCompleteHandler; \
|
||||
}; \
|
||||
} DUMMYUNIONNAME3; \
|
||||
RESET_COMPLETE_HANDLER ResetCompleteHandler; \
|
||||
REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \
|
||||
union { \
|
||||
_ANONYMOUS_UNION union { \
|
||||
RECEIVE_HANDLER ReceiveHandler; \
|
||||
WAN_RECEIVE_HANDLER WanReceiveHandler; \
|
||||
}; \
|
||||
} DUMMYUNIONNAME4; \
|
||||
RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \
|
||||
STATUS_HANDLER StatusHandler; \
|
||||
STATUS_COMPLETE_HANDLER StatusCompleteHandler; \
|
||||
NDIS_STRING Name;
|
||||
|
||||
typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS {
|
||||
NDIS30_PROTOCOL_CHARACTERISTICS_S;
|
||||
NDIS30_PROTOCOL_CHARACTERISTICS_S
|
||||
} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS;
|
||||
|
||||
|
||||
@ -1423,7 +1423,7 @@ typedef VOID DDKAPI
|
||||
#else /* !__cplusplus */
|
||||
|
||||
#define NDIS40_PROTOCOL_CHARACTERISTICS_S \
|
||||
NDIS30_PROTOCOL_CHARACTERISTICS_S; \
|
||||
NDIS30_PROTOCOL_CHARACTERISTICS_S \
|
||||
RECEIVE_PACKET_HANDLER ReceivePacketHandler; \
|
||||
BIND_HANDLER BindAdapterHandler; \
|
||||
UNBIND_HANDLER UnbindAdapterHandler; \
|
||||
@ -1433,7 +1433,7 @@ typedef VOID DDKAPI
|
||||
#endif /* __cplusplus */
|
||||
|
||||
typedef struct _NDIS40_PROTOCOL_CHARACTERISTICS {
|
||||
NDIS40_PROTOCOL_CHARACTERISTICS_S;
|
||||
NDIS40_PROTOCOL_CHARACTERISTICS_S
|
||||
} NDIS40_PROTOCOL_CHARACTERISTICS, *PNDIS40_PROTOCOL_CHARACTERISTICS;
|
||||
|
||||
/* Prototypes for NDIS 5.0 protocol characteristics */
|
||||
@ -1476,7 +1476,7 @@ typedef VOID DDKAPI
|
||||
#else /* !__cplusplus */
|
||||
|
||||
#define NDIS50_PROTOCOL_CHARACTERISTICS_S \
|
||||
NDIS40_PROTOCOL_CHARACTERISTICS_S; \
|
||||
NDIS40_PROTOCOL_CHARACTERISTICS_S \
|
||||
PVOID ReservedHandlers[4]; \
|
||||
CO_SEND_COMPLETE_HANDLER CoSendCompleteHandler; \
|
||||
CO_STATUS_HANDLER CoStatusHandler; \
|
||||
@ -1486,7 +1486,7 @@ typedef VOID DDKAPI
|
||||
#endif /* !__cplusplus */
|
||||
|
||||
typedef struct _NDIS50_PROTOCOL_CHARACTERISTICS {
|
||||
NDIS50_PROTOCOL_CHARACTERISTICS_S;
|
||||
NDIS50_PROTOCOL_CHARACTERISTICS_S
|
||||
} NDIS50_PROTOCOL_CHARACTERISTICS, *PNDIS50_PROTOCOL_CHARACTERISTICS;
|
||||
|
||||
#if defined(NDIS50) || defined(NDIS51)
|
||||
@ -1499,7 +1499,7 @@ typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
|
||||
} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
|
||||
#elif defined(NDIS30)
|
||||
typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
|
||||
NDIS30_PROTOCOL_CHARACTERISTICS_S;
|
||||
NDIS30_PROTOCOL_CHARACTERISTICS_S
|
||||
} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
|
||||
#else
|
||||
#error Define an NDIS version
|
||||
@ -3731,7 +3731,7 @@ typedef NDIS_STATUS DDKAPI
|
||||
} _UNION_NAME(u2);
|
||||
|
||||
typedef struct _NDIS30_MINIPORT_CHARACTERISTICS {
|
||||
NDIS30_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS30_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS;
|
||||
|
||||
|
||||
@ -3767,7 +3767,7 @@ typedef VOID DDKAPI
|
||||
#else /* !__cplusplus */
|
||||
|
||||
#define NDIS40_MINIPORT_CHARACTERISTICS_S \
|
||||
NDIS30_MINIPORT_CHARACTERISTICS_S; \
|
||||
NDIS30_MINIPORT_CHARACTERISTICS_S \
|
||||
W_RETURN_PACKET_HANDLER ReturnPacketHandler; \
|
||||
W_SEND_PACKETS_HANDLER SendPacketsHandler; \
|
||||
W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler;
|
||||
@ -3775,7 +3775,7 @@ typedef VOID DDKAPI
|
||||
#endif /* !__cplusplus */
|
||||
|
||||
typedef struct _NDIS40_MINIPORT_CHARACTERISTICS {
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS;
|
||||
|
||||
|
||||
@ -3815,7 +3815,7 @@ typedef NDIS_STATUS DDKAPI
|
||||
#ifdef __cplusplus
|
||||
|
||||
#define NDIS50_MINIPORT_CHARACTERISTICS_S \
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S Ndis40Chars; \
|
||||
NDIS40_MINIPORT_CHARACTERISTICS Ndis40Chars; \
|
||||
W_CO_CREATE_VC_HANDLER CoCreateVcHandler; \
|
||||
W_CO_DELETE_VC_HANDLER CoDeleteVcHandler; \
|
||||
W_CO_ACTIVATE_VC_HANDLER CoActivateVcHandler; \
|
||||
@ -3826,7 +3826,7 @@ typedef NDIS_STATUS DDKAPI
|
||||
#else /* !__cplusplus */
|
||||
|
||||
#define NDIS50_MINIPORT_CHARACTERISTICS_S \
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S; \
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S \
|
||||
W_CO_CREATE_VC_HANDLER CoCreateVcHandler; \
|
||||
W_CO_DELETE_VC_HANDLER CoDeleteVcHandler; \
|
||||
W_CO_ACTIVATE_VC_HANDLER CoActivateVcHandler; \
|
||||
@ -3837,7 +3837,7 @@ typedef NDIS_STATUS DDKAPI
|
||||
#endif /* !__cplusplus */
|
||||
|
||||
typedef struct _NDIS50_MINIPORT_CHARACTERISTICS {
|
||||
NDIS50_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS50_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS50_MINIPORT_CHARACTERISTICS, *PSNDIS50_MINIPORT_CHARACTERISTICS;
|
||||
|
||||
|
||||
@ -3851,19 +3851,19 @@ typedef VOID DDKAPI
|
||||
|
||||
#if defined(NDIS51)
|
||||
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
|
||||
NDIS50_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS50_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
|
||||
#elif defined(NDIS50)
|
||||
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
|
||||
NDIS50_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS50_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
|
||||
#elif defined(NDIS40)
|
||||
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS40_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
|
||||
#elif defined(NDIS30)
|
||||
typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
|
||||
NDIS30_MINIPORT_CHARACTERISTICS_S;
|
||||
NDIS30_MINIPORT_CHARACTERISTICS_S
|
||||
} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
|
||||
#endif /* NDIS30 */
|
||||
|
||||
@ -3993,7 +3993,7 @@ typedef struct _NDIS_BIND_PATHS {
|
||||
|
||||
#define ETH_LENGTH_OF_ADDRESS 6
|
||||
|
||||
DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO);
|
||||
DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO)
|
||||
|
||||
DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE)
|
||||
DECLARE_UNKNOWN_PROTOTYPE(ETH_FILTER_CHANGE)
|
||||
@ -4182,10 +4182,10 @@ typedef struct _NDIS_LOG {
|
||||
} NDIS_LOG, *PNDIS_LOG;
|
||||
|
||||
typedef struct _FILTERDBS {
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
PETH_FILTER EthDB;
|
||||
PNULL_FILTER NullDB;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
PTR_FILTER TrDB;
|
||||
PFDDI_FILTER FddiDB;
|
||||
#if ARCNET
|
||||
@ -4288,12 +4288,12 @@ struct _NDIS_MINIPORT_BLOCK {
|
||||
UCHAR TrResetRing;
|
||||
UCHAR ArcnetAddress;
|
||||
UCHAR XState;
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
#if ARCNET
|
||||
PNDIS_ARC_BUF ArcBuf;
|
||||
#endif
|
||||
PVOID BusInterface;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
PNDIS_LOG Log;
|
||||
ULONG SlotNumber;
|
||||
PCM_RESOURCE_LIST AllocatedResources;
|
||||
@ -4348,10 +4348,10 @@ struct _NDIS_MINIPORT_BLOCK {
|
||||
USHORT MediaSenseDisconnectCount;
|
||||
PNDIS_PACKET *xPackets;
|
||||
ULONG UserModeOpenReferences;
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
PVOID SavedSendHandler;
|
||||
PVOID SavedWanSendHandler;
|
||||
};
|
||||
} DUMMYUNIONNAME2;
|
||||
PVOID SavedSendPacketsHandler;
|
||||
PVOID SavedCancelSendPacketsHandler;
|
||||
W_SEND_PACKETS_HANDLER WSendPacketsHandler;
|
||||
@ -4412,10 +4412,10 @@ typedef struct _NDIS_COMMON_OPEN_BLOCK {
|
||||
PNDIS_STRING BindDeviceName;
|
||||
KSPIN_LOCK Reserved5;
|
||||
PNDIS_STRING RootDeviceName;
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
SEND_HANDLER SendHandler;
|
||||
WAN_SEND_HANDLER WanSendHandler;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
TRANSFER_DATA_HANDLER TransferDataHandler;
|
||||
SEND_COMPLETE_HANDLER SendCompleteHandler;
|
||||
TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler;
|
||||
|
||||
Reference in New Issue
Block a user