JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up warnings in ddk.

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

41
winsup/w32api/include/ddk/scsi.h
View File

@ -247,13 +247,18 @@ typedef union _CDB {
UCHAR Control;
} PLAY_AUDIO_MSF, *PPLAY_AUDIO_MSF;
/* FIXME: Should the union be anonymous in C++ too? If so,
can't define named types _LBA and _MSF within anonymous union
for C++. */
struct _PLAY_CD {
UCHAR OperationCode;
UCHAR Reserved1 : 1;
UCHAR CMSF : 1;
UCHAR ExpectedSectorType : 3;
UCHAR Lun : 3;
#ifndef __cplusplus
_ANONYMOUS_UNION
#endif
union {
struct _LBA {
UCHAR StartingBlockAddress[4];
@ -270,10 +275,10 @@ typedef union _CDB {
UCHAR EndingF;
UCHAR Reserved2;
} MSF;
#ifdef __cplusplus
} u;
#ifndef __cplusplus
}DUMMYUNIONNAME;
#else
};
}u;
#endif
UCHAR Audio : 1;
@ -902,14 +907,14 @@ typedef struct _INQUIRYDATA {
UCHAR DeviceTypeQualifier : 3;
UCHAR DeviceTypeModifier : 7;
UCHAR RemovableMedia : 1;
union {
_ANONYMOUS_UNION union {
UCHAR Versions;
struct {
_ANONYMOUS_STRUCT struct {
UCHAR ANSIVersion : 3;
UCHAR ECMAVersion : 3;
UCHAR ISOVersion : 2;
};
};
} DUMMYSTRUCTNAME;
} DUMMYUNIONNAME;
UCHAR ResponseDataFormat : 4;
UCHAR HiSupport : 1;
UCHAR NormACA : 1;
@ -1496,17 +1501,17 @@ typedef struct _MODE_INFO_EXCEPTIONS {
UCHAR Reserved1 : 1;
UCHAR PSBit : 1;
UCHAR PageLength;
union {
_ANONYMOUS_UNION union {
UCHAR Flags;
struct {
_ANONYMOUS_STRUCT struct {
UCHAR LogErr : 1;
UCHAR Reserved2 : 1;
UCHAR Test : 1;
UCHAR Dexcpt : 1;
UCHAR Reserved3 : 3;
UCHAR Perf : 1;
};
};
} DUMMYSTRUCTNAME;
} DUMMYUNIONNAME;
UCHAR ReportMethod : 4;
UCHAR Reserved4 : 4;
UCHAR IntervalTimer[4];
@ -1592,7 +1597,7 @@ typedef struct _TAPE_POSITION_DATA {
/* This structure is used to convert little endian ULONGs
to SCSI CDB big endians values. */
typedef union _EIGHT_BYTE {
struct {
_ANONYMOUS_STRUCT struct {
UCHAR Byte0;
UCHAR Byte1;
UCHAR Byte2;
@ -1601,25 +1606,25 @@ typedef union _EIGHT_BYTE {
UCHAR Byte5;
UCHAR Byte6;
UCHAR Byte7;
};
} DUMMYSTRUCTNAME;
ULONGLONG AsULongLong;
} EIGHT_BYTE, *PEIGHT_BYTE;
typedef union _FOUR_BYTE {
struct {
_ANONYMOUS_STRUCT struct {
UCHAR Byte0;
UCHAR Byte1;
UCHAR Byte2;
UCHAR Byte3;
};
} DUMMYSTRUCTNAME;
ULONG AsULong;
} FOUR_BYTE, *PFOUR_BYTE;
typedef union _TWO_BYTE {
struct {
_ANONYMOUS_STRUCT struct {
UCHAR Byte0;
UCHAR Byte1;
};
} DUMMYSTRUCTNAME;
USHORT AsUShort;
} TWO_BYTE, *PTWO_BYTE;