* 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 9f7bba5..8180948 100644 (file)
--- 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 1ce4254..203d4d3 100644 (file)
--- 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 5dd5032..940e706 100644 (file)
--- 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