diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 04:22:19 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 04:22:19 +0400 |
| commit | d2d223b5802d14e040edec3bff7a10b5eb15d96b (patch) | |
| tree | d59dc3b926d78d2c98285dfbd41ffc91fd43a8cd /winsup/w32api/include/windows.h | |
| parent | e7a8c11c0fa11eb9eac20a1fc279bcce03b77409 (diff) | |
* include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/basetyps.h: Likewise.
(_COM_interface): New define.
(interface): Define to _COM_interface, conditional on !__OBJC__.
Replace 'interface' with '_COM_interface', throughout.
* include/comcat.h: Replace 'interface' with '_COM_interface', throughout.
* include/commdlg.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/docobj.h: Replace 'interface' with '_COM_interface', throughout.
* include/mshtml.h: Likewise.
* include/oaidl.h: Likewise.
* include/objfwd.h: Likewise.
* include/objidl.h: Likewise.
* include/ocidl.h: Likwise.
* include/olectl.h: Likewise.
* include/oleidl.h: Likewise.
* include/shlobj.h: Likewise.
* include/shlwapi.h: Replace __OBJC__ guard with _OBJC_NO_COM.
* include/vfw.h: Likewise.
* include/windows.h. Likewise. Add comment.
* include/directx/d3d9.h: Replace 'interface' with '_COM_interface',
throughout.
* lib/test.c: Replace __OBJC__ guard with _OBJC_NO_COM.
Add test for conflict with '@interface'
Diffstat (limited to 'winsup/w32api/include/windows.h')
| -rw-r--r-- | winsup/w32api/include/windows.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index dde83a316..97e037e90 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -106,11 +106,14 @@ #endif /* (_WIN32_WINNT >= 0x0400) */ #endif #ifndef NOGDI -#if !defined (__OBJC__) +/* In older versions we disallowed COM declarations in __OBJC__ + because of conflicts with @interface directive. Define _OBJC_NO_COM + to keep this behaviour. */ +#if !defined (_OBJC_NO_COM) #if (__GNUC__ >= 3) || defined (__WATCOMC__) #include <ole2.h> #endif -#endif /* __OBJC__ */ +#endif /* _OBJC_NO_COM */ #endif #endif /* WIN32_LEAN_AND_MEAN */ |