From: dannysmith <dannysmith>
Date: Wed, 8 Jan 2003 10:55:00 +0000 (+0000)
Subject: 	* lib/dxguid.c: Don't #include <objbase.h>.
X-Git-Tag: cr-0x99~4074
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b0a57939827fa511e25bd3c1285107af072ed29;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* lib/dxguid.c: Don't #include <objbase.h>.
	* include/unknwn.h: Partially revert change of 2002-12-26.
	Don't include <ole2.h>.
---

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9f7bba5651..81809489a9 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,11 @@
 2003-01-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
+	* lib/dxguid.c: Don't #include <objbase.h>.
+	* include/unknwn.h: Partially revert change of 2002-12-26.
+	Don't include <ole2.h>.
+
+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>
diff --git a/winsup/w32api/include/unknwn.h b/winsup/w32api/include/unknwn.h
index 1ce42543ed..203d4d3166 100644
--- a/winsup/w32api/include/unknwn.h
+++ b/winsup/w32api/include/unknwn.h
@@ -1,6 +1,5 @@
 #ifndef COM_NO_WINDOWS_H
 #include <windows.h>
-#include <ole2.h>
 #endif
 
 #ifndef _UNKNWN_H
diff --git a/winsup/w32api/lib/dxguid.c b/winsup/w32api/lib/dxguid.c
index 5dd50328ec..940e7069b2 100644
--- a/winsup/w32api/lib/dxguid.c
+++ b/winsup/w32api/lib/dxguid.c
@@ -25,7 +25,6 @@
 #if defined(__LCC__) || defined(__GNUC__)
 #define INITGUID 1
 #include <windows.h>
-#include <objbase.h>
 #else
 #include <basetyps.h>
 #endif