commit 52ecbf73b12f0a62a25a529cf7d3a0fffc26a9cd
author Francois Gouget <fgouget@free.fr> Mon Oct 04 19:35:40 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 04 19:35:40 2004 +0000
tree 0bfe8d0cd43246e9bf54b5784c6845e2a7be896d
parent fbf77db884f34cc8f1c090658094c5fa3b0abf09

Fix incorrect usage of COBJMACROS.

include/dmplugin.h

diff --git a/include/dmplugin.h b/include/dmplugin.h
index 06575c0..fe49bce 100644
--- a/include/dmplugin.h
+++ b/include/dmplugin.h
@@ -136,7 +136,7 @@
 DECLARE_INTERFACE_(IDirectMusicTool,IUnknown) { IDirectMusicTool_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IDirectMusicTool_QueryInterface(p,a,b)      (p)->lpVtbl->QueryInterface(p,a,b)
 #define IDirectMusicTool_AddRef(p)                  (p)->lpVtbl->AddRef(p)
@@ -162,7 +162,7 @@
 DECLARE_INTERFACE_(IDirectMusicTool8,IDirectMusicTool) { IDirectMusicTool8_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IDirectMusicTool8_QueryInterface(p,a,b)      (p)->lpVtbl->QueryInterface(p,a,b)
 #define IDirectMusicTool8_AddRef(p)                  (p)->lpVtbl->AddRef(p)
@@ -199,7 +199,7 @@
 DECLARE_INTERFACE_(IDirectMusicTrack,IUnknown) { IDirectMusicTrack_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IDirectMusicTrack_QueryInterface(p,a,b)       (p)->lpVtbl->QueryInterface(p,a,b)
 #define IDirectMusicTrack_AddRef(p)                   (p)->lpVtbl->AddRef(p)
@@ -233,7 +233,7 @@
 DECLARE_INTERFACE_(IDirectMusicTrack8,IDirectMusicTrack) { IDirectMusicTrack8_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IDirectMusicTrack8_QueryInterface(p,a,b)       (p)->lpVtbl->QueryInterface(p,a,b)
 #define IDirectMusicTrack8_AddRef(p)                   (p)->lpVtbl->AddRef(p)