commit 486d020c1b738424001585e0ea062e6db96f2aba
author Francois Gouget <fgouget@free.fr> Thu Oct 07 03:06:48 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 07 03:06:48 2004 +0000
tree 4301d4c13f9af5b3e4b54cd54427b4e6088ee312
parent 00033eab75d3485dd700bb90ea16e8971d36af62

Don't define COBJMACROS in objbase.h.
Update the Wine sources accordingly.

dlls/quartz/enummoniker.c

diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c
index 7448c74..1388df3 100644
--- a/dlls/quartz/enummoniker.c
+++ b/dlls/quartz/enummoniker.c
@@ -21,9 +21,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/quartz/filtergraph.c

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 1016121..8fc417b 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -24,6 +24,8 @@
 #include "config.h"
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/quartz/quartz_private.h

diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 52bc284..37443fd 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -25,6 +25,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wtypes.h"