From 3ff90f19d36e9d20c22a04a30f17c45003696ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Tue, 12 Dec 2017 14:41:53 +0100 Subject: [PATCH] Fix macro clash with _USE_MATH_DEFINES. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: chromium:788675 Change-Id: I4840fd013a81ffe157323b0bb876d64fd60d8a19 Reviewed-on: https://webrtc-review.googlesource.com/32304 Reviewed-by: Henrik Lundin Commit-Queue: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#21235} --- modules/audio_processing/beamformer/nonlinear_beamformer.h | 2 ++ modules/audio_processing/include/audio_processing.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/audio_processing/beamformer/nonlinear_beamformer.h b/modules/audio_processing/beamformer/nonlinear_beamformer.h index 76556e7a45..5b79dc467e 100644 --- a/modules/audio_processing/beamformer/nonlinear_beamformer.h +++ b/modules/audio_processing/beamformer/nonlinear_beamformer.h @@ -12,7 +12,9 @@ #define MODULES_AUDIO_PROCESSING_BEAMFORMER_NONLINEAR_BEAMFORMER_H_ // MSVC++ requires this to be set before any other includes to get M_PI. +#ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES +#endif #include diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index b750c6960e..ab9d2cda77 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -12,7 +12,9 @@ #define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_ // MSVC++ requires this to be set before any other includes to get M_PI. +#ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES +#endif #include #include // size_t