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/include/directx | |
| 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/include/directx')
| -rw-r--r-- | winsup/w32api/include/directx/d3d9.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/winsup/w32api/include/directx/d3d9.h b/winsup/w32api/include/directx/d3d9.h index 0a9a0a5f7..920c1294e 100644 --- a/winsup/w32api/include/directx/d3d9.h +++ b/winsup/w32api/include/directx/d3d9.h @@ -98,23 +98,23 @@ extern const GUID IID_IDirect3DQuery9; }; #endif -typedef interface IDirect3D9 IDirect3D9; -typedef interface IDirect3DDevice9 IDirect3DDevice9; -typedef interface IDirect3DVolume9 IDirect3DVolume9; -typedef interface IDirect3DSwapChain9 IDirect3DSwapChain9; -typedef interface IDirect3DResource9 IDirect3DResource9; -typedef interface IDirect3DSurface9 IDirect3DSurface9; -typedef interface IDirect3DVertexBuffer9 IDirect3DVertexBuffer9; -typedef interface IDirect3DIndexBuffer9 IDirect3DIndexBuffer9; -typedef interface IDirect3DBaseTexture9 IDirect3DBaseTexture9; -typedef interface IDirect3DCubeTexture9 IDirect3DCubeTexture9; -typedef interface IDirect3DTexture9 IDirect3DTexture9; -typedef interface IDirect3DVolumeTexture9 IDirect3DVolumeTexture9; -typedef interface IDirect3DVertexDeclaration9 IDirect3DVertexDeclaration9; -typedef interface IDirect3DVertexShader9 IDirect3DVertexShader9; -typedef interface IDirect3DPixelShader9 IDirect3DPixelShader9; -typedef interface IDirect3DStateBlock9 IDirect3DStateBlock9; -typedef interface IDirect3DQuery9 IDirect3DQuery9; +typedef _COM_interface IDirect3D9 IDirect3D9; +typedef _COM_interface IDirect3DDevice9 IDirect3DDevice9; +typedef _COM_interface IDirect3DVolume9 IDirect3DVolume9; +typedef _COM_interface IDirect3DSwapChain9 IDirect3DSwapChain9; +typedef _COM_interface IDirect3DResource9 IDirect3DResource9; +typedef _COM_interface IDirect3DSurface9 IDirect3DSurface9; +typedef _COM_interface IDirect3DVertexBuffer9 IDirect3DVertexBuffer9; +typedef _COM_interface IDirect3DIndexBuffer9 IDirect3DIndexBuffer9; +typedef _COM_interface IDirect3DBaseTexture9 IDirect3DBaseTexture9; +typedef _COM_interface IDirect3DCubeTexture9 IDirect3DCubeTexture9; +typedef _COM_interface IDirect3DTexture9 IDirect3DTexture9; +typedef _COM_interface IDirect3DVolumeTexture9 IDirect3DVolumeTexture9; +typedef _COM_interface IDirect3DVertexDeclaration9 IDirect3DVertexDeclaration9; +typedef _COM_interface IDirect3DVertexShader9 IDirect3DVertexShader9; +typedef _COM_interface IDirect3DPixelShader9 IDirect3DPixelShader9; +typedef _COM_interface IDirect3DStateBlock9 IDirect3DStateBlock9; +typedef _COM_interface IDirect3DQuery9 IDirect3DQuery9; #undef INTERFACE #define INTERFACE IDirect3D9 |