From aef6b479176977d3d90ebf18ab2460909a8e0ab5 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 14 Apr 2000 14:06:49 +0000 Subject: [PATCH] Changed the placement of WINE_UNUSED to make gcc 2.7.2 happy. --- dlls/ddraw/d3ddevice/main.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/direct3d/main.c | 4 ++-- dlls/ddraw/mesa_private.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c index c27ef4aff6b..fe6627206c3 100644 --- a/dlls/ddraw/d3ddevice/main.c +++ b/dlls/ddraw/d3ddevice/main.c @@ -670,7 +670,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_GetDirect3D( /******************************************************************************* * Direct3DDevice VTable */ -static WINE_UNUSED ICOM_VTABLE(IDirect3DDevice) d3d_d3ddevice_vtbl = +static ICOM_VTABLE(IDirect3DDevice) WINE_UNUSED d3d_d3ddevice_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DDeviceImpl_QueryInterface, diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a16a342160c..50835ea42fc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -9,7 +9,7 @@ #include "winuser.h" #include "ddraw.h" -static WINE_UNUSED const char *ddProp = "WINE_DDRAW_Property"; +static const char WINE_UNUSED *ddProp = "WINE_DDRAW_Property"; /**************************************************************************** * This is the main DirectDraw driver interface. It is supposed to be called diff --git a/dlls/ddraw/direct3d/main.c b/dlls/ddraw/direct3d/main.c index 7086ed02d41..fd9ed2f0d8a 100644 --- a/dlls/ddraw/direct3d/main.c +++ b/dlls/ddraw/direct3d/main.c @@ -135,7 +135,7 @@ HRESULT WINAPI IDirect3DImpl_FindDevice( /* This is for checking the correctness of the prototypes/functions. * Do not remove. */ -static WINE_UNUSED ICOM_VTABLE(IDirect3D) d3dvt = { +static ICOM_VTABLE(IDirect3D) WINE_UNUSED d3dvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DImpl_QueryInterface, IDirect3DImpl_AddRef, @@ -265,7 +265,7 @@ HRESULT WINAPI IDirect3D2Impl_CreateDevice( /* This is for checking the correctness of the prototypes/functions. * Do not remove. */ -static WINE_UNUSED ICOM_VTABLE(IDirect3D2) d3d2vt = +static ICOM_VTABLE(IDirect3D2) WINE_UNUSED d3d2vt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3D2Impl_QueryInterface, diff --git a/dlls/ddraw/mesa_private.h b/dlls/ddraw/mesa_private.h index aa0fb8296b0..54b542dd6bc 100644 --- a/dlls/ddraw/mesa_private.h +++ b/dlls/ddraw/mesa_private.h @@ -140,14 +140,14 @@ extern int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DD extern LPDIRECT3DTEXTURE2 mesa_d3dtexture2_create(IDirectDrawSurface4Impl*); extern LPDIRECT3DTEXTURE mesa_d3dtexture_create(IDirectDrawSurface4Impl*); -static const WINE_UNUSED GUID IID_D3DDEVICE2_OpenGL = { +static const GUID WINE_UNUSED IID_D3DDEVICE2_OpenGL = { 0x39a0da38, 0x7e57, 0x11d2, { 0x8b,0x7c,0x0e,0x4e,0xd8,0x3c,0x2b,0x3c } }; -static const WINE_UNUSED GUID IID_D3DDEVICE_OpenGL = { +static const GUID WINE_UNUSED IID_D3DDEVICE_OpenGL = { 0x31416d44, 0x86ae, 0x11d2,