diff options
| author | Błażej Szczygieł <spaz16@wp.pl> | 2016-11-15 12:10:05 +0100 |
|---|---|---|
| committer | Błażej Szczygieł <spaz16@wp.pl> | 2016-11-15 12:10:05 +0100 |
| commit | 570a8e6b408a39471c1f4d0d20b2dc147bdcc38f (patch) | |
| tree | bca51e21e3c13f5faa21d79706015ffe977ed2cd /thirdparty | |
| parent | bbc71083c1616047e4ef571a25d254034c69ef33 (diff) | |
Fix compilation with MSVC 2013
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/libvpx/vpx_config.h | 6 |
1 files changed, 5 insertions, 1 deletions
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 |