From 4961ecb3d9b7c2abb2f16dcb7fa56282b3d0c160 Mon Sep 17 00:00:00 2001
From: Danny Smith <dannysmith@users.sourceforge.net>
Date: Wed, 8 Jan 2003 09:15:53 +0000
Subject: [PATCH] 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__.
---
 winsup/w32api/ChangeLog         | 9 +++++++++
 winsup/w32api/include/windows.h | 2 +-
 winsup/w32api/lib/dinput.c      | 1 -
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index dde2e39ab..9f7bba565 100644
--- 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 38a139103..dde83a316 100644
--- 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 1d022a484..40e98ec4a 100644
--- 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