diff options
| author | James Zern <jzern@google.com> | 2015-05-22 12:05:02 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-05-22 12:05:02 -0700 |
| commit | 48d8291df48ede10393f56080a083dd214502c1a (patch) | |
| tree | 2856fd67e5eb9c27e686e58f3b1fbb7627a7cef2 /vp9/common/x86 | |
| parent | 7ca17435d51111d7127586ed592480f9f85a8843 (diff) | |
| download | libvpx-48d8291df48ede10393f56080a083dd214502c1a.tar libvpx-48d8291df48ede10393f56080a083dd214502c1a.tar.gz libvpx-48d8291df48ede10393f56080a083dd214502c1a.tar.bz2 libvpx-48d8291df48ede10393f56080a083dd214502c1a.zip | |
vp9_subpixel_8t_intrin_ssse3: quiet vs9 warning
reorder includes to avoid:
warning C4985: 'ceil': attributes not present on previous declaration.
this is the same workaround used in vp9/common/vp9_systemdependent.h
Change-Id: Ia10dd63de24f96fa1507a6179220e9d6ec774db6
Diffstat (limited to 'vp9/common/x86')
| -rw-r--r-- | vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c b/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c index 4ab49e772..dbd2b5b19 100644 --- a/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c +++ b/vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c @@ -8,9 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +// Due to a header conflict between math.h and intrinsics includes with ceil() +// in certain configurations under vs9 this include needs to precede +// tmmintrin.h. +#include "./vp9_rtcd.h" + #include <tmmintrin.h> -#include "./vp9_rtcd.h" #include "vpx_ports/mem.h" #include "vpx_ports/emmintrin_compat.h" |