* 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)
This commit is contained in:
@@ -23,18 +23,21 @@
|
||||
#ifndef __VIDEO_H
|
||||
#define __VIDEO_H
|
||||
|
||||
#ifdef __WINDDI_H
|
||||
#error winddi.h cannot be included with video.h
|
||||
#endif
|
||||
|
||||
#if __GNUC__ >=3
|
||||
#pragma GCC system_header
|
||||
#endif
|
||||
|
||||
#ifdef __WINDDI_H
|
||||
#error winddi.h cannot be included with video.h
|
||||
#else
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#pragma pack(push,4)
|
||||
|
||||
#include "ntddk.h"
|
||||
|
||||
#if defined(_VIDEOPORT_)
|
||||
@@ -247,6 +250,8 @@ typedef BOOLEAN DDKAPI
|
||||
#define VIDEO_RANGE_PASSIVE_DECODE 1
|
||||
#define VIDEO_RANGE_10_BIT_DECODE 2
|
||||
|
||||
#ifndef VIDEO_ACCESS_RANGE_DEFINED /* also in miniport.h */
|
||||
#define VIDEO_ACCESS_RANGE_DEFINED
|
||||
typedef struct _VIDEO_ACCESS_RANGE {
|
||||
PHYSICAL_ADDRESS RangeStart;
|
||||
ULONG RangeLength;
|
||||
@@ -255,6 +260,7 @@ typedef struct _VIDEO_ACCESS_RANGE {
|
||||
UCHAR RangeShareable;
|
||||
UCHAR RangePassive;
|
||||
} VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
|
||||
#endif
|
||||
|
||||
typedef VOID DDKAPI
|
||||
(*PVIDEO_HW_LEGACYRESOURCES)(
|
||||
@@ -1559,4 +1565,6 @@ VideoPortZeroMemory(
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* defined __WINDDI_H */
|
||||
|
||||
#endif /* __VIDEO_H */
|
||||
|
Reference in New Issue
Block a user