Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2003-01-08 13:55:02 +0300
committerDanny Smith <dannysmith@users.sourceforge.net>2003-01-08 13:55:02 +0300
commit5e1b786d38d0375ef4a7703c8e3673061045719a (patch)
tree7f401444228d2ab36a1232615775e23baa33d6e0
parent4961ecb3d9b7c2abb2f16dcb7fa56282b3d0c160 (diff)
* lib/dxguid.c: Don't #include <objbase.h>.
* include/unknwn.h: Partially revert change of 2002-12-26. Don't include <ole2.h>.
-rw-r--r--winsup/w32api/ChangeLog6
-rw-r--r--winsup/w32api/include/unknwn.h1
-rw-r--r--winsup/w32api/lib/dxguid.c1
3 files changed, 6 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9f7bba565..81809489a 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 1ce42543e..203d4d316 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 5dd50328e..940e7069b 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