From 2c974280aa8c40d29ec89bdc73bc6bf384c010c9 Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Mon, 24 Sep 2018 20:56:07 +0200 Subject: EVR: Prevent redefinition of MFVideoNormalizedRect This establishes compatibility with MinGW-w64 headers 6.0 where MFVideoNormalizedRect has been added to evr.h. Task-number: QTBUG-70630 Change-Id: I49ac49bf9eda8ea281d9da799785e56373ae8f01 Reviewed-by: VaL Doroshchuk Reviewed-by: Marius Kittler --- src/plugins/common/evr/evrdefs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/common') diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h index f898209b8..4f3dd832a 100644 --- a/src/plugins/common/evr/evrdefs.h +++ b/src/plugins/common/evr/evrdefs.h @@ -83,7 +83,8 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**); #define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L) #endif -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(_MFVideoNormalizedRect_) +#define _MFVideoNormalizedRect_ typedef struct MFVideoNormalizedRect { float left; float top; -- cgit v1.2.3