commit 3d506467863871951ed9487b86e9a04ebec71c69
author Alexandre Julliard <julliard@winehq.org> Sat Jan 23 12:37:00 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jan 23 12:37:00 1999 +0000
tree 1086d4c346b67291ce19507ca1c1f147d5d4455a
parent 0c91d0afab5abb133c3b88c49607feba01fb4b6b

Fixed GetObject macro problem.

include/ole.h

diff --git a/include/ole.h b/include/ole.h
index e5d4fab..ab01f85 100644
--- a/include/ole.h
+++ b/include/ole.h
@@ -178,8 +178,12 @@
 	OLESTATUS	(CALLBACK *Close)(LPOLESERVERDOC);
 	OLESTATUS	(CALLBACK *SetHostNames)(LPOLESERVERDOC,LPCOLESTR16,LPCOLESTR16);
 	OLESTATUS	(CALLBACK *SetDocDimensions)(LPOLESERVERDOC,LPRECT16);
-#undef GetObject  /* FIXME */
+#ifdef __WINE__
+/* GetObject is a WINELIB_NAME macro so it cannot be used in Wine itself */
+	OLESTATUS	(CALLBACK *pGetObject)(LPOLESERVERDOC,LPCOLESTR16,LPOLEOBJECT*,LPOLECLIENT);
+#else
 	OLESTATUS	(CALLBACK *GetObject)(LPOLESERVERDOC,LPCOLESTR16,LPOLEOBJECT*,LPOLECLIENT);
+#endif
 	OLESTATUS	(CALLBACK *Release)(LPOLESERVERDOC);
 	OLESTATUS	(CALLBACK *SetColorScheme)(LPOLESERVERDOC,LPLOGPALETTE);
 	OLESTATUS	(CALLBACK *Execute)(LPOLESERVERDOC,HGLOBAL16);