From bdcc7be2bb6e6e101c1fdb32f12c6ce591cd6ec8 Mon Sep 17 00:00:00 2001
From: Danny Smith <dannysmith@users.sourceforge.net>
Date: Thu, 26 Dec 2002 04:23:57 +0000
Subject: [PATCH] 	* include/commcat.h: Don't include windows.h or ole2.h
 ifdef 	COM_NO_WINDOWS_H. 	* include/unknwn.h: Ditto.

---
 winsup/w32api/ChangeLog        | 6 ++++++
 winsup/w32api/include/comcat.h | 2 ++
 winsup/w32api/include/unknwn.h | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9b726517b..b0f53a05d 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/commcat.h: Don't include windows.h or ole2.h ifdef
+	COM_NO_WINDOWS_H.
+	* include/unknwn.h: Ditto.
+	
 2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/imm.h (ImmGetCompositionFont[AW],
diff --git a/winsup/w32api/include/comcat.h b/winsup/w32api/include/comcat.h
index 31b2a8c65..233d923fd 100644
--- a/winsup/w32api/include/comcat.h
+++ b/winsup/w32api/include/comcat.h
@@ -4,8 +4,10 @@
 #pragma GCC system_header
 #endif
 
+#ifndef COM_NO_WINDOWS_H
 #include <windows.h>
 #include <ole2.h>
+#endif
 
 #ifndef _RC_INVOKED
 
diff --git a/winsup/w32api/include/unknwn.h b/winsup/w32api/include/unknwn.h
index 4558a08ad..b8f0be588 100644
--- a/winsup/w32api/include/unknwn.h
+++ b/winsup/w32api/include/unknwn.h
@@ -4,7 +4,11 @@
 #pragma GCC system_header
 #endif
 
+#ifndef COM_NO_WINDOWS_H
 #include <windows.h>
+#include <ole2.h>
+#endif
+
 #ifdef __cplusplus
 extern "C"{
 #endif