From d2d223b5802d14e040edec3bff7a10b5eb15d96b Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Tue, 25 Jul 2006 00:22:19 +0000 Subject: * 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' --- winsup/w32api/include/ws2spi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'winsup/w32api/include/ws2spi.h') diff --git a/winsup/w32api/include/ws2spi.h b/winsup/w32api/include/ws2spi.h index 4f7a01e9d..796171075 100644 --- a/winsup/w32api/include/ws2spi.h +++ b/winsup/w32api/include/ws2spi.h @@ -1,7 +1,7 @@ /* * ws2spi.h * - * Winsock 2 Service Provider interface. + * Winsock 2 Service Provider Interface. * * * THIS SOFTWARE IS NOT COPYRIGHTED -- cgit v1.2.3