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
2003-07-16 21:49:02 +00:00
parent 5cb27dcf09
commit a13fa879dd
21 changed files with 244 additions and 184 deletions

View File

@ -88,10 +88,10 @@ struct _IO_STATUS_BLOCK;
struct _DEVICE_DESCRIPTION;
struct _SCATTER_GATHER_LIST;
DECLARE_INTERNAL_OBJECT(ADAPTER_OBJECT);
DECLARE_INTERNAL_OBJECT(DMA_ADAPTER);
DECLARE_INTERNAL_OBJECT(IO_STATUS_BLOCK);
DECLARE_INTERNAL_OBJECT(SECTION_OBJECT);
DECLARE_INTERNAL_OBJECT(ADAPTER_OBJECT)
DECLARE_INTERNAL_OBJECT(DMA_ADAPTER)
DECLARE_INTERNAL_OBJECT(IO_STATUS_BLOCK)
DECLARE_INTERNAL_OBJECT(SECTION_OBJECT)
#if 1
/* FIXME: Unknown definitions */
@ -110,7 +110,7 @@ typedef ULONG LOGICAL;
#define TAG(_a, _b, _c, _d) (ULONG) \
(((_a) << 0) + ((_b) << 8) + ((_c) << 16) + ((_d) << 24))
static inline struct _KPCR * KeGetCurrentKPCR(
static __inline struct _KPCR * KeGetCurrentKPCR(
VOID)
{
ULONG Value;
@ -2517,14 +2517,14 @@ typedef struct _IO_STACK_LOCATION {
ULONG Length;
FILE_INFORMATION_CLASS POINTER_ALIGNMENT FileInformationClass;
PFILE_OBJECT FileObject;
union {
struct {
_ANONYMOUS_UNION union {
_ANONYMOUS_STRUCT struct {
BOOLEAN ReplaceIfExists;
BOOLEAN AdvanceOnly;
};
} DUMMYSTRUCTNAME;
ULONG ClusterCount;
HANDLE DeleteHandle;
};
} DUMMYUNIONNAME;
} SetFile;
struct {
ULONG Length;
@ -3019,15 +3019,15 @@ typedef VOID DDKAPI
USHORT Depth; \
USHORT MaximumDepth; \
ULONG TotalAllocates; \
union { \
_ANONYMOUS_UNION union { \
ULONG AllocateMisses; \
ULONG AllocateHits; \
}; \
} DUMMYUNIONNAME; \
ULONG TotalFrees; \
union { \
_ANONYMOUS_UNION union { \
ULONG FreeMisses; \
ULONG FreeHits; \
}; \
} DUMMYUNIONNAME2; \
POOL_TYPE Type; \
ULONG Tag; \
ULONG Size; \
@ -3035,23 +3035,23 @@ typedef VOID DDKAPI
PFREE_FUNCTION Free; \
LIST_ENTRY ListEntry; \
ULONG LastTotalAllocates; \
union { \
_ANONYMOUS_UNION union { \
ULONG LastAllocateMisses; \
ULONG LastAllocateHits; \
}; \
} DUMMYUNIONNAME3; \
ULONG Future[2];
typedef struct _GENERAL_LOOKASIDE {
GENERAL_LOOKASIDE_S;
GENERAL_LOOKASIDE_S
} GENERAL_LOOKASIDE, *PGENERAL_LOOKASIDE;
typedef struct _NPAGED_LOOKASIDE_LIST {
GENERAL_LOOKASIDE_S;
GENERAL_LOOKASIDE_S
KSPIN_LOCK Obsoleted;
} NPAGED_LOOKASIDE_LIST, *PNPAGED_LOOKASIDE_LIST;
typedef struct _PAGED_LOOKASIDE_LIST {
GENERAL_LOOKASIDE_S;
GENERAL_LOOKASIDE_S
FAST_MUTEX Obsoleted;
} PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST;
@ -3064,7 +3064,7 @@ typedef VOID DDKAPI (*PCALLBACK_FUNCTION)(
typedef enum _EVENT_TYPE {
NotificationEvent,
SynchronizationEvent,
SynchronizationEvent
} EVENT_TYPE;
typedef enum _KWAIT_REASON {
@ -4010,7 +4010,7 @@ RtlAssert(
#define IsListEmpty(_ListHead) \
((_ListHead)->Flink == (_ListHead))
static inline PSINGLE_LIST_ENTRY
static __inline PSINGLE_LIST_ENTRY
PopEntryList(
IN PSINGLE_LIST_ENTRY ListHead)
{
@ -4054,7 +4054,7 @@ PopEntryList(
(_Entry)->Blink = NULL; \
}
static inline PLIST_ENTRY
static __inline PLIST_ENTRY
RemoveHeadList(
IN PLIST_ENTRY ListHead)
{
@ -4077,7 +4077,7 @@ RemoveHeadList(
return Entry;
}
static inline PLIST_ENTRY
static __inline PLIST_ENTRY
RemoveTailList(
IN PLIST_ENTRY ListHead)
{
@ -5009,7 +5009,7 @@ ExAcquireSharedWaitForExclusive(
IN PERESOURCE Resource,
IN BOOLEAN Wait);
static inline PVOID
static __inline PVOID
ExAllocateFromNPagedLookasideList(
IN PNPAGED_LOOKASIDE_LIST Lookaside)
{
@ -5024,7 +5024,7 @@ ExAllocateFromNPagedLookasideList(
return Entry;
}
static inline PVOID
static __inline PVOID
ExAllocateFromPagedLookasideList(
IN PPAGED_LOOKASIDE_LIST Lookaside)
{
@ -5142,7 +5142,7 @@ ExFreePoolWithTag(
#define ExQueryDepthSList(ListHead) QueryDepthSList(ListHead)
static inline VOID
static __inline VOID
ExFreeToNPagedLookasideList(
IN PNPAGED_LOOKASIDE_LIST Lookaside,
IN PVOID Entry)
@ -5157,7 +5157,7 @@ ExFreeToNPagedLookasideList(
}
}
static inline VOID
static __inline VOID
ExFreeToPagedLookasideList(
IN PPAGED_LOOKASIDE_LIST Lookaside,
IN PVOID Entry)