| author | Ralph Giles <giles@mozilla.com> |
| Tue, 22 Aug 2017 13:04:05 -0500 | |
| changeset 651431 | 28399d0161af4fefed0174bbc9a886521015f375 |
| parent 651430 | 8417a6e70471f467430bcfa5bf5c8efe5c0452db |
| child 651432 | c6988b23609540e1ccc8b4f53b037578f193ff1f |
| push id | 75726 |
| push user | bmo:giles@thaumas.net |
| push date | Wed, 23 Aug 2017 18:12:50 +0000 |
| milestone | 57.0a1 |
--- a/third_party/aom/av1/common/odintrin.h +++ b/third_party/aom/av1/common/odintrin.h @@ -9,17 +9,17 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ /* clang-format off */ #ifndef AV1_COMMON_ODINTRIN_H_ #define AV1_COMMON_ODINTRIN_H_ -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES) # define _USE_MATH_DEFINES #endif #include <math.h> #include <stdlib.h> #include <string.h> #include "aom/aom_integer.h" #include "aom_dsp/aom_dsp_common.h"