summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-03-05 22:02:29 -0800
committerJames Zern <jzern@google.com>2014-03-05 22:02:29 -0800
commite9680bef22ad83442c78fe2f3320c13ffb53cb47 (patch)
tree7edc225207c816c5b2a04cb5637850e7fb5a1ccc /vp9/common
parent6e079b7dd44f3401f6af3f8c1f061f858ce682d0 (diff)
downloadlibvpx-e9680bef22ad83442c78fe2f3320c13ffb53cb47.tar
libvpx-e9680bef22ad83442c78fe2f3320c13ffb53cb47.tar.gz
libvpx-e9680bef22ad83442c78fe2f3320c13ffb53cb47.tar.bz2
libvpx-e9680bef22ad83442c78fe2f3320c13ffb53cb47.zip
vp9_systemdependent: reorder includes avoid proto mismatch
fixes a warning in vs9/x64 related to ceil() Change-Id: Ic4bde9d0b7e961546dbe304de74aa37fc02fcf94
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_systemdependent.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_systemdependent.h b/vp9/common/vp9_systemdependent.h
index 72edbca55..e97115823 100644
--- 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