ref: e7fe1543f614ed4c4ec3979de44479bf305212af
parent: fd9ff3336b7093363677abba4a186f57385ffb03
parent: e9680bef22ad83442c78fe2f3320c13ffb53cb47
author: James Zern <jzern@google.com>
date: Thu Mar 6 06:42:50 EST 2014
Merge "vp9_systemdependent: reorder includes avoid proto mismatch"
--- a/vp9/common/vp9_systemdependent.h
+++ b/vp9/common/vp9_systemdependent.h
@@ -12,11 +12,11 @@
#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
-# include <math.h>
# define snprintf _snprintf
#endif
--
⑨