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:
@ -57,8 +57,8 @@ typedef enum _HIDP_KEYBOARD_DIRECTION {
|
||||
} HIDP_KEYBOARD_DIRECTION;
|
||||
|
||||
typedef struct _HIDP_KEYBOARD_MODIFIER_STATE {
|
||||
union {
|
||||
struct {
|
||||
_ANONYMOUS_UNION union {
|
||||
_ANONYMOUS_STRUCT struct {
|
||||
ULONG LeftControl : 1;
|
||||
ULONG LeftShift : 1;
|
||||
ULONG LeftAlt : 1;
|
||||
@ -71,9 +71,9 @@ typedef struct _HIDP_KEYBOARD_MODIFIER_STATE {
|
||||
ULONG ScollLock : 1;
|
||||
ULONG NumLock : 1;
|
||||
ULONG Reserved : 21;
|
||||
};
|
||||
} DUMMYSTRUCTNAME;
|
||||
ULONG ul;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE;
|
||||
|
||||
typedef BOOLEAN (DDKAPI *PHIDP_INSERT_SCANCODES)(
|
||||
@ -121,7 +121,7 @@ typedef struct _HIDP_BUTTON_CAPS {
|
||||
BOOLEAN IsDesignatorRange;
|
||||
BOOLEAN IsAbsolute;
|
||||
ULONG Reserved[10];
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
struct {
|
||||
USAGE UsageMin, UsageMax;
|
||||
USHORT StringMin, StringMax;
|
||||
@ -134,7 +134,7 @@ typedef struct _HIDP_BUTTON_CAPS {
|
||||
USHORT DesignatorIndex, Reserved3;
|
||||
USHORT DataIndex, Reserved4;
|
||||
} NotRange;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} HIDP_BUTTON_CAPS, *PHIDP_BUTTON_CAPS;
|
||||
|
||||
typedef struct _HIDP_CAPS {
|
||||
@ -159,10 +159,10 @@ typedef struct _HIDP_CAPS {
|
||||
typedef struct _HIDP_DATA {
|
||||
USHORT DataIndex;
|
||||
USHORT Reserved;
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
ULONG RawValue;
|
||||
BOOLEAN On;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} HIDP_DATA, *PHIDP_DATA;
|
||||
|
||||
typedef struct _HIDP_EXTENDED_ATTRIBUTES {
|
||||
@ -209,7 +209,7 @@ typedef struct _HIDP_VALUE_CAPS {
|
||||
ULONG Units;
|
||||
LONG LogicalMin, LogicalMax;
|
||||
LONG PhysicalMin, PhysicalMax;
|
||||
union {
|
||||
_ANONYMOUS_UNION union {
|
||||
struct {
|
||||
USAGE UsageMin, UsageMax;
|
||||
USHORT StringMin, StringMax;
|
||||
@ -222,7 +222,7 @@ typedef struct _HIDP_VALUE_CAPS {
|
||||
USHORT DesignatorIndex, Reserved3;
|
||||
USHORT DataIndex, Reserved4;
|
||||
} NotRange;
|
||||
};
|
||||
} DUMMYUNIONNAME;
|
||||
} HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS;
|
||||
|
||||
typedef enum _HIDP_REPORT_TYPE {
|
||||
@ -517,7 +517,7 @@ DDKAPI
|
||||
HidP_SetUsages(
|
||||
IN HIDP_REPORT_TYPE ReportType,
|
||||
IN USAGE UsagePage,
|
||||
IN USHORT LinkCollection, // Optional
|
||||
IN USHORT LinkCollection, /* Optional */
|
||||
IN PUSAGE UsageList,
|
||||
IN OUT PULONG UsageLength,
|
||||
IN PHIDP_PREPARSED_DATA PreparsedData,
|
||||
|
Reference in New Issue
Block a user