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/d3dx8core.h

diff --git a/include/d3dx8core.h b/include/d3dx8core.h
index 9011757..7d33ec0 100644
--- a/include/d3dx8core.h
+++ b/include/d3dx8core.h
@@ -64,7 +64,7 @@
 DECLARE_INTERFACE_(ID3DXBuffer,IUnknown) { ID3DXBuffer_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define ID3DXBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ID3DXBuffer_AddRef(p)             (p)->lpVtbl->AddRef(p)
@@ -87,7 +87,7 @@
 DECLARE_INTERFACE_(ID3DXFont,IUnknown) { ID3DXFont_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define ID3DXFont_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ID3DXFont_AddRef(p)             (p)->lpVtbl->AddRef(p)