These fixes seem to be necessary for successful compilation when include/wine/obj_base.h has been eliminated. Log: Ove Kaaven <ovek@transgaming.com> Where ICOM macros are needed, include objbase.h. Index: include/dinput.h =================================================================== RCS file: /home/wine/wine/include/dinput.h,v retrieving revision 1.30 diff -u -r1.30 dinput.h --- include/dinput.h 14 Jun 2002 00:39:44 -0000 1.30 +++ include/dinput.h 20 Dec 2002 11:33:33 -0000 @@ -20,7 +20,7 @@ #define __WINE_DINPUT_H #include "windef.h" /* for MAX_PATH */ -#include "unknwn.h" +#include "objbase.h" #ifndef DIRECTINPUT_VERSION #define DIRECTINPUT_VERSION 0x0800 Index: include/oaidl.h =================================================================== RCS file: /home/wine/wine/include/oaidl.h,v retrieving revision 1.7 diff -u -r1.7 oaidl.h --- include/oaidl.h 5 Dec 2002 20:33:07 -0000 1.7 +++ include/oaidl.h 20 Dec 2002 11:33:34 -0000 @@ -32,9 +32,7 @@ #error DO NOT INCLUDE DIRECTLY #endif -#define __WINE_INCLUDE_OBJIDL -#include "objidl.h" -#undef __WINE_INCLUDE_OBJIDL +#include "objbase.h" /* the following depend only on obj_base.h */ #include "wine/obj_oleaut.h" #include "wine/obj_errorinfo.h"
