OSDN Git Service

* include/aclui.h: Replace __OBJC__ guard with _OBJC_NO_COM.
authordannysmith <dannysmith>
Tue, 25 Jul 2006 00:22:19 +0000 (00:22 +0000)
committerdannysmith <dannysmith>
Tue, 25 Jul 2006 00:22:19 +0000 (00:22 +0000)
commitc6b1885c4daa776f81d8cd72360f37efc0d81e7c
treeea3b7d62096ba23bb1d8581e57cb4751ddf2a2e8
parent2d8e2f5ac7d5eae6aa4657a386d4f0282e36a40d
* 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'
20 files changed:
winsup/w32api/ChangeLog
winsup/w32api/include/aclui.h
winsup/w32api/include/basetyps.h
winsup/w32api/include/comcat.h
winsup/w32api/include/commdlg.h
winsup/w32api/include/directx/d3d9.h
winsup/w32api/include/docobj.h
winsup/w32api/include/mshtml.h
winsup/w32api/include/oaidl.h
winsup/w32api/include/objfwd.h
winsup/w32api/include/objidl.h
winsup/w32api/include/ocidl.h
winsup/w32api/include/olectl.h
winsup/w32api/include/oleidl.h
winsup/w32api/include/shlobj.h
winsup/w32api/include/shlwapi.h
winsup/w32api/include/vfw.h
winsup/w32api/include/windows.h
winsup/w32api/include/ws2spi.h
winsup/w32api/lib/test.c