diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-19 01:34:26 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-19 01:34:26 +0000 |
| commit | 037c11e868787e40b08a29f70657d5f734a11d88 (patch) | |
| tree | 9ee88c7b195aeadd4eb92d7951f49bb3a82094c4 /winsup/w32api/include/ddk/minitape.h | |
| parent | 97745949216575566de6d8654da6f6a14b5170ed (diff) | |
| download | cygnal-037c11e868787e40b08a29f70657d5f734a11d88.tar.gz cygnal-037c11e868787e40b08a29f70657d5f734a11d88.tar.bz2 cygnal-037c11e868787e40b08a29f70657d5f734a11d88.zip | |
* include/ddk/hidusage.h: Remove unneccessary #pragma pack's.
* include/ddk/miniport.h (EMULATOR_PORT_ACCESS_TYPE): Define
before using.
(VIDEO_ACCESS_RANGE): Guard against prior definition.
* include/ddk/minitape.h (INQUIRYDATA): Guard against prior
definition.
* include/ddk/ndis.h (DECLARE_UNKNOWN_PROTOTYPE): Correct macro.
* include/ddk/ndisguid.h: Remove unneccessary #pragma pack's.
* include/ddk/scsi.h (INQUIRYDATA): Guard against prior
definition.
* include/ddk/scsiwmi.h (GUID): Define if not already done.
(LPCGUID): Likewise.
* include/ddk/tdi.h: Close "Listen flags" comment.
* include/ddk/tdistat.h: Remove unneccessary #pragma pack's.
* include/ddk/video.h: Add #pragma pack(push,4) to balance.
(VIDEO_ACCESS_RANGE): Guard against prior definition.
* include/ddk/videoagp.h:Add #pragma pack(push,4) to balance.
* include/ddk/win2k.h: Likewise.
* include/ddk/winddi.h: Likewise.
* include/ddk/winddk.h: Likewise.
* include/ddk/winnt4.h: Likewise.
* include/ddk/ws2san.h: Likewise.
* include/ddk/xfilter.h: Remove unbalanced #pragma pack(pop).
* include/ddk/video.h: Don't process rest of file ifdef
__WINDDI_H.
* include/ddk/winddi.h: Don't process rest of file ifdef
__VIDEO_H.
* include/ddk/usb.h: Don't process rest of file ifdef
__USBDI_H.
* include/ddk/usbdi.h: Don't process rest of file ifdef
__USB_H.
* include/ddk/usbcamdi.h: Don't process rest of file if
!defined(__USB_H) && !defined(__USBDI_H)
Diffstat (limited to 'winsup/w32api/include/ddk/minitape.h')
| -rw-r--r-- | winsup/w32api/include/ddk/minitape.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/winsup/w32api/include/ddk/minitape.h b/winsup/w32api/include/ddk/minitape.h index 55aff0156..7540dea62 100644 --- a/winsup/w32api/include/ddk/minitape.h +++ b/winsup/w32api/include/ddk/minitape.h @@ -76,7 +76,8 @@ typedef enum _TAPE_STATUS { } TAPE_STATUS, *PTAPE_STATUS; #define INQUIRYDATABUFFERSIZE 36 - +#ifndef _INQUIRYDATA_DEFINED /* also in scsi.h */ +#define _INQUIRYDATA_DEFINED typedef struct _INQUIRYDATA { UCHAR DeviceType : 5; UCHAR DeviceTypeQualifier : 3; @@ -119,6 +120,7 @@ typedef struct _INQUIRYDATA { UCHAR VendorSpecific[20]; UCHAR Reserved3[40]; } INQUIRYDATA, *PINQUIRYDATA; +#endif typedef struct _MODE_CAPABILITIES_PAGE { UCHAR PageCode : 6; |