[PSDK]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 30 Jun 2010 19:36:36 +0000 (19:36 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 30 Jun 2010 19:36:36 +0000 (19:36 +0000)
- Fix EVENT_FILTER_DESCRIPTOR redefinition.

svn path=/trunk/; revision=47918

reactos/include/psdk/evntprov.h
reactos/include/psdk/evntrace.h

index 87acfa5..c7c37d5 100644 (file)
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#define _EVNTPROV_
+
 #ifndef EVNTAPI
 #ifndef MIDL_PASS
 #ifdef _EVNT_SOURCE_
@@ -67,11 +69,13 @@ typedef struct _EVENT_DESCRIPTOR {
 } EVENT_DESCRIPTOR, *PEVENT_DESCRIPTOR;
 typedef const EVENT_DESCRIPTOR *PCEVENT_DESCRIPTOR;
 
+#ifndef _EVNTRACE_
 typedef struct _EVENT_FILTER_DESCRIPTOR {
   ULONGLONG Ptr;
   ULONG Size;
   ULONG Type;
 } EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR;
+#endif
 
 typedef struct _EVENT_FILTER_HEADER {
   USHORT Id;
index 75e1d5e..1940bae 100644 (file)
@@ -596,7 +596,9 @@ typedef struct _TRACE_GUID_REGISTRATION {
 typedef struct _EVENT_RECORD EVENT_RECORD, *PEVENT_RECORD;
 typedef struct _EVENT_TRACE_LOGFILEW EVENT_TRACE_LOGFILEW, *PEVENT_TRACE_LOGFILEW;
 typedef struct _EVENT_TRACE_LOGFILEA EVENT_TRACE_LOGFILEA, *PEVENT_TRACE_LOGFILEA;
+#ifndef _EVNTPROV_
 typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR;
+#endif
 
 typedef ULONG
 (WINAPI *PEVENT_TRACE_BUFFER_CALLBACKW)(