[akhaldi] 47918: [PSDK] - Fix EVENT_FILTER_DESCRIPTOR redefinition.

Author: akhaldi
Date: Wed Jun 30 19:36:36 2010
New Revision: 47918

URL: http://svn.reactos.org/svn/reactos?rev=47918&view=rev
Log:
[PSDK]
- Fix EVENT_FILTER_DESCRIPTOR redefinition.

Modified:
    trunk/reactos/include/psdk/evntprov.h
    trunk/reactos/include/psdk/evntrace.h

Modified: trunk/reactos/include/psdk/evntprov.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntprov.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/evntprov.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/evntprov.h [iso-8859-1] Wed Jun 30 19:36:36 2010
@@ -19,6 +19,8 @@
  */

#pragma once
+
+#define _EVNTPROV_

#ifndef EVNTAPI
 #ifndef MIDL_PASS
@@ -67,11 +69,13 @@
 } 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;

Modified: trunk/reactos/include/psdk/evntrace.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Wed Jun 30 19:36:36 2010
@@ -596,7 +596,9 @@
 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)(