[PATCH 2/8] dbgeng: Don't redefine IDebugClient (gcc 4.3)

[Fabian Maurer]

From: Fabian Maurer

Signed-off-by: Fabian Maurer 
---
 include/dbgeng.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/dbgeng.h b/include/dbgeng.h
index 4322eff5302..423f2c47cbc 100644
--- a/include/dbgeng.h
+++ b/include/dbgeng.h
@@ -210,9 +210,9 @@ DEFINE_GUID(IID_IDebugSystemObjects3,     0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9

#ifndef __IDebugClient_FWD_DEFINED__
 #define __IDebugClient_FWD_DEFINED__
-typedef interface IDebugClient IDebugClient;
-#ifdef __cplusplus
 interface IDebugClient;
+#ifdef __cplusplus
+typedef interface IDebugClient IDebugClient;
 #endif /* __cplusplus */
 #endif

@@ -388,7 +388,7 @@ DECLARE_INTERFACE_(IDebugBreakpoint, IUnknown)
     /* IDebugBreakpoint */
     STDMETHOD(GetId)(THIS_ PULONG id) PURE;
     STDMETHOD(GetType)(THIS_ PULONG breaktype, PULONG proc) PURE;
-    STDMETHOD(GetAdder)(THIS_ IDebugClient **adder) PURE;
+    STDMETHOD(GetAdder)(THIS_ interface IDebugClient **adder) PURE;
     STDMETHOD(GetFlags)(THIS_ PULONG flags) PURE;
     STDMETHOD(AddFlags)(THIS_ ULONG flags) PURE;
     STDMETHOD(RemoveFlags)(THIS_ ULONG flags) PURE;
@@ -420,7 +420,7 @@ DECLARE_INTERFACE_(IDebugBreakpoint2, IUnknown)
     /* IDebugBreakpoint */
     STDMETHOD(GetId)(THIS_ PULONG id) PURE;
     STDMETHOD(GetType)(THIS_ PULONG breaktype, PULONG proc) PURE;
-    STDMETHOD(GetAdder)(THIS_ IDebugClient **adder) PURE;
+    STDMETHOD(GetAdder)(THIS_ interface IDebugClient **adder) PURE;
     STDMETHOD(GetFlags)(THIS_ PULONG flags) PURE;
     STDMETHOD(AddFlags)(THIS_ ULONG flags) PURE;
     STDMETHOD(RemoveFlags)(THIS_ ULONG flags) PURE;