Where ICOM macros are needed, include objbase.h.

0087da59 · Ove Kaaven · Alexandre Julliard · e42b3ee4 · 0087da59 · 0087da59
Commit 0087da59 authored Dec 23, 2002 by Ove Kaaven Committed by Alexandre Julliard Dec 23, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

dinput.h include/dinput.h +1 -1

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

No files found.
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -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

--- a/include/oaidl.h
+++ b/include/oaidl.h
@@ -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"