From 858634d5f4b0474f7298c571a21a0fdc4620eebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 10 Aug 2017 12:59:41 +0200 Subject: Fix 64-bit build using MinGW The relevant changes was made for 32-bit, but not 64 Change-Id: I7dc1a299d72a742efca7c56717274c0c2ea0c579 Reviewed-by: Frederik Gladhorn --- src/3rdparty/iaccessible2/generated/amd64/ia2_api_all.h | 5 +++-- src/3rdparty/iaccessible2/generated/amd64/ia2_api_all_i.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/3rdparty/iaccessible2/generated') diff --git a/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all.h b/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all.h index 4f7b7d07d7..1008728034 100644 --- a/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all.h +++ b/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all.h @@ -16,8 +16,9 @@ */ /* @@MIDL_FILE_HEADING( ) */ -#pragma warning( disable: 4049 ) /* more than 64k source lines */ - +#ifdef _MSC_VER +# pragma warning( disable: 4049 ) /* more than 64k source lines */ +#endif /* verify that the version is high enough to compile this file*/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ diff --git a/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all_i.c b/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all_i.c index e04a5dcb69..4687e9942d 100644 --- a/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all_i.c +++ b/src/3rdparty/iaccessible2/generated/amd64/ia2_api_all_i.c @@ -18,8 +18,9 @@ */ /* @@MIDL_FILE_HEADING( ) */ -#pragma warning( disable: 4049 ) /* more than 64k source lines */ - +#ifdef _MSC_VER +# pragma warning( disable: 4049 ) /* more than 64k source lines */ +#endif #ifdef __cplusplus extern "C"{ @@ -65,7 +66,7 @@ typedef IID CLSID; #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \ const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} -#endif !_MIDL_USE_GUIDDEF_ +#endif // !_MIDL_USE_GUIDDEF_ MIDL_DEFINE_GUID(IID, IID_IAccessibleRelation,0x7CDF86EE,0xC3DA,0x496a,0xBD,0xA4,0x28,0x1B,0x33,0x6E,0x1F,0xDC); -- cgit v1.2.3