gecko/media/libvpx/msvc2015.patch
Brian Smith 63b6fa3518 Bug 1119776, Part 2: Avoid defining snprintf when MSVC provides it (video), r=giles
--HG--
extra : rebase_source : 0ea7b0b1a65b31993df689784dd17e741a0c312e
2015-01-08 22:32:03 -08:00

25 lines
682 B
Diff

diff --git a/media/libvpx/vp9/common/vp9_systemdependent.h b/media/libvpx/vp9/common/vp9_systemdependent.h
--- a/media/libvpx/vp9/common/vp9_systemdependent.h
+++ b/media/libvpx/vp9/common/vp9_systemdependent.h
@@ -12,17 +12,19 @@
#define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
#ifdef _MSC_VER
# include <math.h> // the ceil() definition must precede intrin.h
# if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86))
# include <intrin.h>
# define USE_MSC_INTRIN
# endif
-# define snprintf _snprintf
+# if _MSC_VER < 1900
+# define snprintf _snprintf
+# endif
#endif
#ifdef __cplusplus
extern "C" {
#endif
#include "./vpx_config.h"
#if ARCH_X86 || ARCH_X86_64