diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-06-09 03:37:20 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-06-09 03:37:20 +0000 |
| commit | 63f4c63a191672b97fc8c9d31b91c2c0a4c98f89 (patch) | |
| tree | ad6bbee73f9bc6244b8c1132490d7d9c980e7229 | |
| parent | 6643e348be54bf6974f1aa233be30f027a8b30b5 (diff) | |
| download | cygnal-63f4c63a191672b97fc8c9d31b91c2c0a4c98f89.tar.gz cygnal-63f4c63a191672b97fc8c9d31b91c2c0a4c98f89.tar.bz2 cygnal-63f4c63a191672b97fc8c9d31b91c2c0a4c98f89.zip | |
* include/windows.h (ole2.h): #include if !__OBJC__ and
__GNUC__ >=3 and !WIN32_LEAN_AND_MEAN.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/windows.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 414db2e4c..b8ecf419b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2002-06-08 Danny Smith <dannysmith@users.sourceforge.net> + + * include/windows.h (ole2.h): #include if !__OBJC__ and + __GNUC__ >=3 and !WIN32_LEAN_AND_MEAN. + 2002-06-07 Gunnar Degnbol <gdegnbol@users.sourceforge.net> * include/mapi.h: Change LPTSTR to LPSTR throughout. diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index 6934a8684..a1e5c3d12 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -103,6 +103,11 @@ #include <winsock.h> #endif /* (_WIN32_WINNT >= 0x0400) */ #endif +#if !defined (__OBJC__) +#if __GNUC__ >= 3 /* what about Watcom? */ +#include <ole2.h> +#endif +#endif /* __OBJC__ */ #endif /* WIN32_LEAN_AND_MEAN */ #endif /* RC_INVOKED */ |