From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../modules/audio_processing/test/aec_dump_based_simulator.h | 3 --- .../libwebrtc/modules/audio_processing/test/debug_dump_replayer.h | 4 +--- third_party/libwebrtc/modules/audio_processing/test/protobuf_utils.h | 4 +--- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'third_party/libwebrtc/modules/audio_processing/test') diff --git a/third_party/libwebrtc/modules/audio_processing/test/aec_dump_based_simulator.h b/third_party/libwebrtc/modules/audio_processing/test/aec_dump_based_simulator.h index e2c1f3e4ba..4713c800ec 100644 --- a/third_party/libwebrtc/modules/audio_processing/test/aec_dump_based_simulator.h +++ b/third_party/libwebrtc/modules/audio_processing/test/aec_dump_based_simulator.h @@ -15,15 +15,12 @@ #include #include "modules/audio_processing/test/audio_processing_simulator.h" -#include "rtc_base/ignore_wundef.h" -RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else #include "modules/audio_processing/debug.pb.h" #endif -RTC_POP_IGNORING_WUNDEF() namespace webrtc { namespace test { diff --git a/third_party/libwebrtc/modules/audio_processing/test/debug_dump_replayer.h b/third_party/libwebrtc/modules/audio_processing/test/debug_dump_replayer.h index be21c68663..077147eb68 100644 --- a/third_party/libwebrtc/modules/audio_processing/test/debug_dump_replayer.h +++ b/third_party/libwebrtc/modules/audio_processing/test/debug_dump_replayer.h @@ -16,11 +16,9 @@ #include "absl/strings/string_view.h" #include "common_audio/channel_buffer.h" #include "modules/audio_processing/include/audio_processing.h" -#include "rtc_base/ignore_wundef.h" -RTC_PUSH_IGNORING_WUNDEF() +// Generated at build-time by the protobuf compiler. #include "modules/audio_processing/debug.pb.h" -RTC_POP_IGNORING_WUNDEF() namespace webrtc { namespace test { diff --git a/third_party/libwebrtc/modules/audio_processing/test/protobuf_utils.h b/third_party/libwebrtc/modules/audio_processing/test/protobuf_utils.h index b9c2e819f9..eb93383f5a 100644 --- a/third_party/libwebrtc/modules/audio_processing/test/protobuf_utils.h +++ b/third_party/libwebrtc/modules/audio_processing/test/protobuf_utils.h @@ -14,12 +14,10 @@ #include #include // no-presubmit-check TODO(webrtc:8982) -#include "rtc_base/ignore_wundef.h" #include "rtc_base/protobuf_utils.h" -RTC_PUSH_IGNORING_WUNDEF() +// Generated at build-time by the protobuf compiler. #include "modules/audio_processing/debug.pb.h" -RTC_POP_IGNORING_WUNDEF() namespace webrtc { -- cgit v1.2.3