include: don't redefine _EVENT_TYPE or _TIMER_TYPE
Austin English
austinenglish at gmail.com
Tue Feb 3 12:57:09 CST 2015
Newer SDKs have removed winternal.h (looks like a lot of it moved to
ntdef.h and ddk/wdm.h). Until that transition is complete, guard the two
instances of _EVENT_TYPE and _TIMER_TYPE behind appropriate preprocessor
definitions.
--
-Austin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20150203/3008c6e0/attachment.html>
-------------- next part --------------
diff --git a/include/ntdef.h b/include/ntdef.h
index 83ecffd..fc11a35 100644
--- a/include/ntdef.h
+++ b/include/ntdef.h
@@ -23,15 +23,21 @@
extern "C" {
#endif
+#ifndef _EVENT_TYPE_DEFINED
+#define _EVENT_TYPE_DEFINED
typedef enum _EVENT_TYPE {
NotificationEvent,
SynchronizationEvent
} EVENT_TYPE;
+#endif
+#ifndef _TIMER_TYPE_DEFINED
+#define _TIMER_TYPE_DEFINED
typedef enum _TIMER_TYPE {
NotificationTimer,
SynchronizationTimer
} TIMER_TYPE;
+#endif
typedef enum _WAIT_TYPE {
WaitAll,
diff --git a/include/winternl.h b/include/winternl.h
index 1a694da..d1dab92 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -813,10 +813,13 @@ typedef enum _SYSTEM_INFORMATION_CLASS {
SystemInformationClassMax
} SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;
+#ifndef _TIMER_TYPE_DEFINED
+#define _TIMER_TYPE_DEFINED
typedef enum _TIMER_TYPE {
NotificationTimer,
SynchronizationTimer
} TIMER_TYPE;
+#endif
typedef enum _THREADINFOCLASS {
ThreadBasicInformation,
@@ -1762,10 +1765,13 @@ typedef VOID (CALLBACK *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPVOID);
typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG );
+#ifndef _EVENT_TYPE_DEFINED
+#define _EVENT_TYPE_DEFINED
typedef enum _EVENT_TYPE {
NotificationEvent,
SynchronizationEvent
} EVENT_TYPE, *PEVENT_TYPE;
+#endif
typedef enum _EVENT_INFORMATION_CLASS {
EventBasicInformation
More information about the wine-patches
mailing list