From 09ba620e3fe3f6b5b0fadbb4e2f8a77704ba5128 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 5 Mar 2011 04:51:01 +0000 Subject: [PATCH] 2011-03-04 Chris Sutcliffe * include/winioctl.h (_DRIVE_LAYOUT_INFORMATION_MBR): Add _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED guard. * include/ddk/winddk.h (_DRIVE_LAYOUT_INFORMATION_MBR): Ditto. --- winsup/w32api/ChangeLog | 6 ++++++ winsup/w32api/include/ddk/winddk.h | 4 +++- winsup/w32api/include/winioctl.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 967796888..8709d105d 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2011-03-04 Chris Sutcliffe + + * include/winioctl.h (_DRIVE_LAYOUT_INFORMATION_MBR): Add + _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED guard. + * include/ddk/winddk.h (_DRIVE_LAYOUT_INFORMATION_MBR): Ditto. + 2011-03-04 Seth Jackson * include/winnt.h (PAGE_WRITECOMBINE): Define. diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h index 0c9d695a4..3ddc356a0 100644 --- a/winsup/w32api/include/ddk/winddk.h +++ b/winsup/w32api/include/ddk/winddk.h @@ -1075,10 +1075,12 @@ enum IRP_RETRY_IO_COMPLETION = 0x4000 }; - +#ifndef _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED +#define _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { ULONG Signature; } DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; +#endif typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { GUID DiskId; diff --git a/winsup/w32api/include/winioctl.h b/winsup/w32api/include/winioctl.h index 44704d744..efa0b732e 100644 --- a/winsup/w32api/include/winioctl.h +++ b/winsup/w32api/include/winioctl.h @@ -432,9 +432,12 @@ typedef struct _DRIVE_LAYOUT_INFORMATION_GPT { LARGE_INTEGER UsableLength; ULONG MaxPartitionCount; } DRIVE_LAYOUT_INFORMATION_GPT,*PDRIVE_LAYOUT_INFORMATION_GPT; +#ifndef _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED +#define _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED typedef struct _DRIVE_LAYOUT_INFORMATION_MBR { ULONG Signature; } DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR; +#endif typedef struct _PARTITION_INFORMATION_MBR { BYTE PartitionType; BOOLEAN BootIndicator;