2003-01-08 Danny Smith <dannysmith@users.sourceforge.net>

	* lib/dinput.c: Don't #include <objbase.h>.

2003-01-08  Bart Oldeman  <bartoldeman@users.sourceforge.net>

	* include/windows.h (ole2.h):Do #include for
	__WATCOMC__.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index dde2e39..9f7bba5 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-08  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * lib/dinput.c: Don't #include <objbase.h>.
+
+2003-01-08  Bart Oldeman  <bartoldeman@users.sourceforge.net>
+
+       * include/windows.h (ole2.h):Do #include for
+       __WATCOMC__.
+
 2003-01-05  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/winuser.h (SPI_SETWHEELSCROLLLINES) Add define.

diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
index 38a1391..dde83a3 100644 (file)
--- a/winsup/w32api/include/windows.h
+++ b/winsup/w32api/include/windows.h
@@ -107,7 +107,7 @@
 #endif
 #ifndef NOGDI
 #if !defined (__OBJC__)
-#if  __GNUC__ >= 3  /* what about Watcom? */
+#if (__GNUC__ >= 3) || defined (__WATCOMC__)
 #include <ole2.h>
 #endif
 #endif /* __OBJC__ */

diff --git a/winsup/w32api/lib/dinput.c b/winsup/w32api/lib/dinput.c
index 1d022a4..40e98ec 100644 (file)
--- a/winsup/w32api/lib/dinput.c
+++ b/winsup/w32api/lib/dinput.c
@@ -23,7 +23,6 @@
 
 #if defined(__LCC__) || defined(__GNUC__) || defined(__WATCOMC__)
 #include <windows.h>
-#include <objbase.h>
 #else
 #include <basetyps.h>
 #endif