[PATCH 0/2] MR1798: Don't redefine typedefs - Initial work for gcc 4.3 support

[Fabian Maurer (＠DarkShadow44)]

Initial MR to gauge interest, there's a bunch more if this one is accepted.
Since we still support old gcc, this MR starts fixing issues that prevents compilation.
Site note: AFAIK, according to ANSI C redefining typedefs is not allowed either, so this seems a logical change.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1798

[PATCH 1/2] d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3)

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de>
---
 include/d2d1_1.idl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
index b60064be3b6..9da56050ecb 100644
--- a/include/d2d1_1.idl
+++ b/include/d2d1_1.idl
@@ -157,7 +157,7 @@ typedef enum D2D1_LAYER_OPTIONS1
     D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff,
 } D2D1_LAYER_OPTIONS1;
 
-typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING;
+struct D2D1_PROPERTY_BINDING;
 typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F;
 
 typedef enum D2D1_PROPERTY_TYPE
@@ -936,14 +936,14 @@ interface ID2D1Factory1 : ID2D1Factory
     HRESULT RegisterEffectFromStream(
         [in] REFCLSID effect_id,
         [in] IStream *property_xml,
-        [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings,
+        [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings,
         [in] UINT32 binding_count,
         [in] PD2D1_EFFECT_FACTORY effect_factory
     );
     HRESULT RegisterEffectFromString(
         [in] REFCLSID effect_id,
         [in] const WCHAR *property_xml,
-        [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings,
+        [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings,
         [in] UINT32 binding_count,
         [in] PD2D1_EFFECT_FACTORY effect_factory
     );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1798

[PATCH 2/2] d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3)

[Fabian Maurer]

From: Fabian Maurer <dark.shadow4(a)web.de>

Signed-off-by: Fabian Maurer <dark.shadow4(a)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,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1798