* include/commcat.h: Don't include windows.h or ole2.h ifdef

	COM_NO_WINDOWS_H.
	* include/unknwn.h: Ditto.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9b72651..b0f53a0 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,11 @@
 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],
        ImmSetCompositionFont[AW]): Add NOGDI guard.
 

diff --git a/winsup/w32api/include/comcat.h b/winsup/w32api/include/comcat.h
index 31b2a8c..233d923 100644 (file)
--- 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 4558a08..b8f0be5 100644 (file)
--- 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