diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 00:22:19 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2006-07-25 00:22:19 +0000 |
| commit | d2d223b5802d14e040edec3bff7a10b5eb15d96b (patch) | |
| tree | d59dc3b926d78d2c98285dfbd41ffc91fd43a8cd /winsup/w32api/lib | |
| parent | e7a8c11c0fa11eb9eac20a1fc279bcce03b77409 (diff) | |
| download | cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.tar.gz cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.tar.bz2 cygnal-d2d223b5802d14e040edec3bff7a10b5eb15d96b.zip | |
* 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/lib')
| -rw-r--r-- | winsup/w32api/lib/test.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c index f4959b4fe..2db731ba0 100644 --- a/winsup/w32api/lib/test.c +++ b/winsup/w32api/lib/test.c @@ -31,7 +31,6 @@ #include <httpext.h> #include <icm.h> #include <imagehlp.h> -#include <initguid.h> #include <ipexport.h> #include <iphlpapi.h> #include <ipifcons.h> @@ -86,7 +85,8 @@ #include <windns.h> #include <usp10.h> -#ifndef __OBJC__ /* problems with BOOL */ +#ifndef _OBJC_NO_COM +#include <initguid.h> #include <ole2.h> #include <comcat.h> #include <shlobj.h> @@ -107,11 +107,19 @@ #include <servprov.h> #include <aclui.h> #include <mlang.h> -#else -#undef BOOL #endif -#include <stdio.h> +#ifdef __OBJC__ +#undef BOOL + +@interface class1 { + int e; +} +@end + +@implementation class1 +@end +#endif int main() { |