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

diff --git a/include/mapiutil.h b/include/mapiutil.h
index 86983b5..4f6d147 100644
--- a/include/mapiutil.h
+++ b/include/mapiutil.h
@@ -139,7 +139,7 @@
 DECLARE_INTERFACE_(ITableData,IUnknown) { ITableData_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
         /*** IUnknown methods ***/
 #define ITableData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITableData_AddRef(p)             (p)->lpVtbl->AddRef(p)
@@ -223,7 +223,7 @@
 DECLARE_INTERFACE_(IPropData,IMAPIProp) { IPropData_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
         /*** IUnknown methods ***/
 #define IPropData_QueryInterface(p,a,b)        (p)->lpVtbl->QueryInterface(p,a,b)
 #define IPropData_AddRef(p)                    (p)->lpVtbl->AddRef(p)