Include oaidl.h instead of wine/obj_oleaut.h.

a4a8472f · Ove Kaaven · Alexandre Julliard · e057a7a0 · a4a8472f · a4a8472f
Commit a4a8472f authored Jan 05, 2003 by Ove Kaaven Committed by Alexandre Julliard Jan 05, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

docobj.h include/docobj.h +3 -1

ocidl.h include/ocidl.h +4 -1

No files found.
--- a/include/docobj.h
+++ b/include/docobj.h
@@ -31,7 +31,9 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "wine/obj_oleaut.h"
+#define __WINE_INCLUDE_OAIDL
+#include "oaidl.h"
+#undef __WINE_INCLUDE_OAIDL

 /*****************************************************************************
 * Declare the structures

--- a/include/ocidl.h
+++ b/include/ocidl.h
@@ -34,7 +34,10 @@
 #include "oleidl.h"
 #undef __WINE_INCLUDE_OLEIDL

-#include "wine/obj_oleaut.h"
+#define __WINE_INCLUDE_OAIDL
+#include "oaidl.h"
+#undef __WINE_INCLUDE_OAIDL
+
 #include "wine/obj_olefont.h"
 #include "wine/obj_picture.h"