From: Zhiyi Zhang Subject: [PATCH] include: Avoid type redefinition. Message-Id: Date: Sun, 24 Mar 2019 10:52:55 +0800 UUID_DEFINED doesn't exist on Windows but it's needed by wine because of the usage of some wine private headers. And some older compilers can't handle the redefinition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46892 Signed-off-by: Zhiyi Zhang --- include/ddk/ntddk.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index fb8cacc188..719ba67c6a 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,11 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; + +#ifndef UUID_DEFINED +#define UUID_DEFINED typedef GUID UUID; +#endif NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, -- 2.20.1