Skip to content
Snippets Groups Projects
Commit e7fe1543 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge "vp9_systemdependent: reorder includes avoid proto mismatch"

parents fd9ff333 e9680bef
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
vp9/common/vp9_systemdependent.h
+ 1
− 1
View file @ e7fe1543
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_
#ifdef _MSC_VER #ifdef _MSC_VER
# include <math.h> // the ceil() definition must precede intrin.h
# if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) # if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86))
# include <intrin.h> # include <intrin.h>
# define USE_MSC_INTRIN # define USE_MSC_INTRIN
# endif # endif
# include <math.h>
# define snprintf _snprintf # define snprintf _snprintf
#endif #endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment