These files can include oaidl.h directly since they're supposed to be IDL-generated (and these #defines will thus go away by themselves when they are), but they shouldn't include wine/obj_oleaut.h of course. Apart from oaidl.h itself, they're the last direct users of obj_oleaut.h in my tree. Log: Ove Kaaven <ovek@transgaming.com> Include oaidl.h instead of wine/obj_oleaut.h. Index: include/docobj.h =================================================================== RCS file: /home/wine/wine/include/docobj.h,v retrieving revision 1.11 diff -u -r1.11 docobj.h --- include/docobj.h 3 Jan 2003 19:12:55 -0000 1.11 +++ include/docobj.h 4 Jan 2003 15:16:41 -0000 @@ -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 Index: include/ocidl.h =================================================================== RCS file: /home/wine/wine/include/ocidl.h,v retrieving revision 1.10 diff -u -r1.10 ocidl.h --- include/ocidl.h 4 Jan 2003 00:52:20 -0000 1.10 +++ include/ocidl.h 4 Jan 2003 15:16:41 -0000 @@ -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"
