Roderick Colenbrander : include: Undefine INTERFACE before defining it.
Alexandre Julliard
julliard at winehq.org
Wed Sep 8 13:32:13 CDT 2010
Module: wine
Branch: master
Commit: 6154bf1ad85114f1ede62dd7b199c0b74495c013
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6154bf1ad85114f1ede62dd7b199c0b74495c013
Author: Roderick Colenbrander <thunderbird2k at gmail.com>
Date: Wed Sep 8 00:20:12 2010 +0200
include: Undefine INTERFACE before defining it.
---
include/d3d.h | 1 +
include/d3d8.h | 1 +
include/d3d9.h | 1 +
include/ddraw.h | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/d3d.h b/include/d3d.h
index 7297755..409be1b 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -202,6 +202,7 @@ typedef DWORD D3DVIEWPORTHANDLE, *LPD3DVIEWPORTHANDLE;
/*****************************************************************************
* IDirect3D interface
*/
+#undef INTERFACE
#define INTERFACE IDirect3D
DECLARE_INTERFACE_(IDirect3D,IUnknown)
{
diff --git a/include/d3d8.h b/include/d3d8.h
index 46e0812..88da40d 100644
--- a/include/d3d8.h
+++ b/include/d3d8.h
@@ -129,6 +129,7 @@ typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLU
/*****************************************************************************
* IDirect3D8 interface
*/
+#undef INTERFACE
#define INTERFACE IDirect3D8
DECLARE_INTERFACE_(IDirect3D8,IUnknown)
{
diff --git a/include/d3d9.h b/include/d3d9.h
index 09ce3d0..3f9ebf2 100644
--- a/include/d3d9.h
+++ b/include/d3d9.h
@@ -163,6 +163,7 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
/*****************************************************************************
* IDirect3D9 interface
*/
+#undef INTERFACE
#define INTERFACE IDirect3D9
DECLARE_INTERFACE_(IDirect3D9,IUnknown)
{
diff --git a/include/ddraw.h b/include/ddraw.h
index eea7e09..88990f0 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -1220,6 +1220,7 @@ typedef struct tagDDDEVICEIDENTIFIER2 {
/*****************************************************************************
* IDirectDrawPalette interface
*/
+#undef INTERFACE
#define INTERFACE IDirectDrawPalette
DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
{
More information about the wine-cvs
mailing list