OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ | 11 #ifndef VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ |
12 #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ | 12 #define VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ |
13 | 13 |
14 #ifdef _MSC_VER | 14 #ifdef _MSC_VER |
| 15 # include <math.h> // the ceil() definition must precede intrin.h |
15 # if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) | 16 # if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) |
16 # include <intrin.h> | 17 # include <intrin.h> |
17 # define USE_MSC_INTRIN | 18 # define USE_MSC_INTRIN |
18 # endif | 19 # endif |
19 # include <math.h> | |
20 # define snprintf _snprintf | 20 # define snprintf _snprintf |
21 #endif | 21 #endif |
22 | 22 |
23 #ifdef __cplusplus | 23 #ifdef __cplusplus |
24 extern "C" { | 24 extern "C" { |
25 #endif | 25 #endif |
26 | 26 |
27 #include "./vpx_config.h" | 27 #include "./vpx_config.h" |
28 #if ARCH_X86 || ARCH_X86_64 | 28 #if ARCH_X86 || ARCH_X86_64 |
29 void vpx_reset_mmx_state(void); | 29 void vpx_reset_mmx_state(void); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 } | 74 } |
75 return log; | 75 return log; |
76 } | 76 } |
77 #endif | 77 #endif |
78 | 78 |
79 #ifdef __cplusplus | 79 #ifdef __cplusplus |
80 } // extern "C" | 80 } // extern "C" |
81 #endif | 81 #endif |
82 | 82 |
83 #endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ | 83 #endif // VP9_COMMON_VP9_SYSTEMDEPENDENT_H_ |
OLD | NEW |