* include/windows.h (ole2.h): #include if !__OBJC__ and

	__GNUC__ >=3 and !WIN32_LEAN_AND_MEAN.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 414db2e..b8ecf41 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-08  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/windows.h (ole2.h): #include if !__OBJC__ and
+       __GNUC__ >=3 and !WIN32_LEAN_AND_MEAN.
+
 2002-06-07  Gunnar Degnbol <gdegnbol@users.sourceforge.net>
 
        * include/mapi.h: Change LPTSTR to LPSTR throughout.

diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index 6934a86..a1e5c3d 100644 (file)
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -103,6 +103,11 @@
 #include <winsock.h>
 #endif /*  (_WIN32_WINNT >= 0x0400) */
 #endif
+#if !defined (__OBJC__)
+#if  __GNUC__ >= 3  /* what about Watcom? */
+#include <ole2.h>
+#endif
+#endif /* __OBJC__ */
 #endif /* WIN32_LEAN_AND_MEAN */
 
 #endif /* RC_INVOKED */