JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM.

Browse Source 
* 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'
This commit is contained in:
Danny Smith
2006-07-25 00:22:19 +00:00
parent e7a8c11c0f
commit d2d223b580
20 changed files with 238 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/w32api/lib/test.c
View File

@ -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()
{