include/objbase.h: Add missing include directives.

Francois Gouget fgouget at free.fr
Tue Nov 7 17:52:15 CST 2006


---

I'm putting the urlmon.h include inside an ifndef __WINESRC__, because 
otherwise anything that include objbase.h (over 100 files) must also 
include winuser.h to get the LPMSG type.

 include/objbase.h |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/objbase.h b/include/objbase.h
index a248e98..85af95a 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -281,13 +281,16 @@ #define __IRpcChannelBuffer_FWD_DEFINED_
 typedef interface IRpcChannelBuffer IRpcChannelBuffer;
 #endif
 
-#include <objidl.h>
-
 #ifndef RC_INVOKED
 /* For compatibility only, at least for now */
 #include <stdlib.h>
 #endif
 
+#include <wtypes.h>
+#include <unknwn.h>
+#include <objidl.h>
+
+#include <guiddef.h>
 #ifndef INITGUID
 #include <cguid.h>
 #endif
@@ -511,7 +514,9 @@ #ifdef __cplusplus
 }
 #endif
 
-/* FIXME: #include <urlmon.h> */
+#ifndef __WINESRC__
+# include <urlmon.h>
+#endif
 #include <propidl.h>
 
 #ifndef __WINESRC__
-- 
1.4.1.1




More information about the wine-patches mailing list