diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-26 07:23:57 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-26 07:23:57 +0300 |
| commit | bdcc7be2bb6e6e101c1fdb32f12c6ce591cd6ec8 (patch) | |
| tree | ebcb5068796e8a27e3a4410afb72ff80c2c25c6d | |
| parent | ebe02e18847a427f41208dddb6d62f2748849b88 (diff) | |
* include/commcat.h: Don't include windows.h or ole2.h ifdef
COM_NO_WINDOWS_H.
* include/unknwn.h: Ditto.
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/comcat.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/unknwn.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 9b726517b..b0f53a05d 100644 --- 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 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 |