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

diff --git a/include/shlobj.h b/include/shlobj.h
index 0c51861..5d4295f 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -192,7 +192,7 @@
 DECLARE_INTERFACE_(IShellIcon, IUnknown) { IShellIcon_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IShellIcon_QueryInterface(p,a,b)      (p)->lpVtbl->QueryInterface(p,a,b)
 #define IShellIcon_AddRef(p)                  (p)->lpVtbl->AddRef(p)
@@ -809,7 +809,7 @@
 DECLARE_INTERFACE_(IShellChangeNotify, IUnknown) { IShellChangeNotify_METHODS };
 #undef INTERFACE
 
-#ifdef COBJMACROS
+#if !defined(__cplusplus) || defined(CINTERFACE)
 /*** IUnknown methods ***/
 #define IShellChangeNotify_QueryInterface(p,a,b)      (p)->lpVtbl->QueryInterface(p,a,b)
 #define IShellChangeNotify_AddRef(p)                  (p)->lpVtbl->AddRef(p)