Module: wine Branch: master Commit: ae84e423c5d0e7d9d8c083b1f64029ef41e6e1fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ae84e423c5d0e7d9d8c083b1f64029e...
Author: Fabian Maurer dark.shadow4@web.de Date: Mon Dec 12 18:56:34 2022 +0100
d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3).
Signed-off-by: Fabian Maurer dark.shadow4@web.de
---
include/d3dx10core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/d3dx10core.h b/include/d3dx10core.h index cca9052cc13..c8c5e97505f 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -287,8 +287,8 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain, ID3D10Device **device); -typedef interface ID3D10Device1 ID3D10Device1; -HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +interface ID3D10Device1; +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, interface ID3D10Device1 **device1); HRESULT WINAPI D3DX10CreateFontIndirectA(ID3D10Device *device, const D3DX10_FONT_DESCA *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT_DESCW *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontA(ID3D10Device *device, INT height, UINT width, UINT weight,