From 570a8e6b408a39471c1f4d0d20b2dc147bdcc38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= Date: Tue, 15 Nov 2016 12:10:05 +0100 Subject: Fix compilation with MSVC 2013 --- thirdparty/libvpx/vpx_config.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'thirdparty') diff --git a/thirdparty/libvpx/vpx_config.h b/thirdparty/libvpx/vpx_config.h index 7058f0327b..9ed45d4006 100644 --- a/thirdparty/libvpx/vpx_config.h +++ b/thirdparty/libvpx/vpx_config.h @@ -9,7 +9,11 @@ #ifndef VPX_CONFIG_H #define VPX_CONFIG_H #define RESTRICT -#define INLINE inline +#if defined(_MSC_VER) && (_MSC_VER < 1900) + #define INLINE __inline +#else + #define INLINE inline +#endif #define HAVE_MIPS32 0 #define HAVE_MEDIA 0 -- cgit v1.2.3