Module: wine Branch: master Commit: f76447bbab78008b556672aeac38995e101148c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f76447bbab78008b556672aea...
Author: Zhiyi Zhang zzhang@codeweavers.com Date: Sun Mar 24 10:52:55 2019 +0800
include: Avoid type redefinition.
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 zzhang@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/ddk/ntddk.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index fb8cacc..719ba67 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,