This reverts commit d551b7d85ec63c0fa33f1a51ec5157722709fc53. Redefining EXTERN_C to an empty string isn't the right thing here, as that makes EXTERN_C wrong for any later header that is included (omitting "extern" on variable declarations, which breaks with GCC 10 and Clang 11, where -fno-common is set by default).
Signed-off-by: Martin Storsjö <[email protected]> --- mingw-w64-headers/include/mftransform.h | 5 ----- mingw-w64-headers/include/mftransform.idl | 8 -------- 2 files changed, 13 deletions(-) diff --git a/mingw-w64-headers/include/mftransform.h b/mingw-w64-headers/include/mftransform.h index 5be048b0c..2e5877303 100644 --- a/mingw-w64-headers/include/mftransform.h +++ b/mingw-w64-headers/include/mftransform.h @@ -509,11 +509,6 @@ static FORCEINLINE HRESULT IMFTransform_ProcessOutput(IMFTransform* This,DWORD d #endif /* __IMFTransform_INTERFACE_DEFINED__ */ -#if defined(__GNUC__) && !defined(__cplusplus) -#undef EXTERN_C -#define EXTERN_C -#endif - EXTERN_C const DECLSPEC_SELECTANY PROPERTYKEY MFPKEY_CLSID = {{0xc57a84c0,0x1a80,0x40a3,{0x97,0xb5,0x92,0x72,0xa4,0x3,0xc8,0xae}}, 0x01}; EXTERN_C const DECLSPEC_SELECTANY PROPERTYKEY MFPKEY_CATEGORY = {{0xc57a84c0,0x1a80,0x40a3,{0x97,0xb5,0x92,0x72,0xa4,0x3,0xc8,0xae}}, 0x02 }; EXTERN_C const DECLSPEC_SELECTANY PROPERTYKEY MFPKEY_EXATTRIBUTE_SUPPORTED = {{0x456fe843,0x3c87,0x40c0,{0x94,0x9d,0x14,0x9,0xc9,0x7d,0xab,0x2c}}, 0x01}; diff --git a/mingw-w64-headers/include/mftransform.idl b/mingw-w64-headers/include/mftransform.idl index bea0182dc..9b917367a 100644 --- a/mingw-w64-headers/include/mftransform.idl +++ b/mingw-w64-headers/include/mftransform.idl @@ -143,14 +143,6 @@ interface IMFTransform : IUnknown [out] DWORD *pdwStatus); } -/* In gcc, declaring something 'extern' and then initializing it - generates a warning. */ -cpp_quote("#if defined(__GNUC__) && !defined(__cplusplus)") -cpp_quote("#undef EXTERN_C") -cpp_quote("#define EXTERN_C") -cpp_quote("#endif") -cpp_quote("") - cpp_quote("EXTERN_C const DECLSPEC_SELECTANY PROPERTYKEY MFPKEY_CLSID = {{0xc57a84c0,0x1a80,0x40a3,{0x97,0xb5,0x92,0x72,0xa4,0x3,0xc8,0xae}}, 0x01};") cpp_quote("EXTERN_C const DECLSPEC_SELECTANY PROPERTYKEY MFPKEY_CATEGORY = {{0xc57a84c0,0x1a80,0x40a3,{0x97,0xb5,0x92,0x72,0xa4,0x3,0xc8,0xae}}, 0x02 };") cpp_quote("EXTERN_C const DECLSPEC_SELECTANY PROPERTYKEY MFPKEY_EXATTRIBUTE_SUPPORTED = {{0x456fe843,0x3c87,0x40c0,{0x94,0x9d,0x14,0x9,0xc9,0x7d,0xab,0x2c}}, 0x01};") -- 2.17.1 _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
