Alexandre Julliard : include: Avoid redefining base types in ntdef.h.
Alexandre Julliard
julliard at winehq.org
Thu Dec 10 16:05:29 CST 2020
Module: wine
Branch: master
Commit: d442b41ec655b1f073f45ff165a717e4c99f5a62
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d442b41ec655b1f073f45ff165a717e4c99f5a62
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Dec 10 21:42:59 2020 +0100
include: Avoid redefining base types in ntdef.h.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49106
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/ntdef.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/ntdef.h b/include/ntdef.h
index 069e86575b8..68ced669baa 100644
--- a/include/ntdef.h
+++ b/include/ntdef.h
@@ -50,6 +50,7 @@ typedef enum _WAIT_TYPE {
#define NT_WARNING(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x80000000)
#define NT_ERROR(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0xc0000000)
+#ifndef BASETYPES
#define BASETYPES
typedef unsigned char UCHAR, *PUCHAR;
typedef unsigned short USHORT, *PUSHORT;
@@ -58,6 +59,7 @@ typedef unsigned long ULONG, *PULONG;
#else
typedef unsigned int ULONG, *PULONG;
#endif
+#endif
typedef struct _RTL_BALANCED_NODE
{
More information about the wine-cvs
mailing list