Switch C++-style C headers with their C equivalents.
The C++ headers define the C functions within the std:: namespace, but
we mainly don't use the std:: namespace for C functions. Therefore we
should include the C headers.
BUG=1833
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1917004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4486 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/common_audio/resampler/push_resampler.cc b/webrtc/common_audio/resampler/push_resampler.cc
index 05c6c61..92775af 100644
--- a/webrtc/common_audio/resampler/push_resampler.cc
+++ b/webrtc/common_audio/resampler/push_resampler.cc
@@ -10,7 +10,7 @@
#include "webrtc/common_audio/resampler/include/push_resampler.h"
-#include <cstring>
+#include <string.h>
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/resampler/include/resampler.h"
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.cc b/webrtc/common_audio/resampler/push_sinc_resampler.cc
index 224d757..97febbd 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler.cc
+++ b/webrtc/common_audio/resampler/push_sinc_resampler.cc
@@ -10,8 +10,9 @@
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
-#include <cmath>
-#include <cstring>
+#include <math.h>
+#include <string.h>
+
#include <algorithm>
namespace webrtc {
@@ -62,7 +63,7 @@
resampler_->Resample(destination_frames_, float_buffer_.get());
for (int i = 0; i < destination_frames_; ++i) {
float clipped = std::max(std::min(float_buffer_[i], 32767.0f), -32768.0f);
- destination[i] = static_cast<int16_t>(std::floor(clipped + 0.5));
+ destination[i] = static_cast<int16_t>(floor(clipped + 0.5));
}
source_ptr_ = NULL;
return destination_frames_;
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
index 25b7bee..28b26ac 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cmath>
+#include <math.h>
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -82,7 +82,7 @@
resampler_source.Run(input_samples, source.get());
for (int i = 0; i < kNumBlocks; ++i) {
for (int j = 0; j < input_block_size; ++j) {
- source_int[j] = static_cast<int16_t>(std::floor(32767 *
+ source_int[j] = static_cast<int16_t>(floor(32767 *
source[i * input_block_size + j] + 0.5));
}
EXPECT_EQ(output_block_size,
diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc
index b66ed34..05c0027 100644
--- a/webrtc/common_audio/resampler/sinc_resampler.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler.cc
@@ -90,8 +90,9 @@
#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
#include "webrtc/typedefs.h"
-#include <cmath>
-#include <cstring>
+#include <math.h>
+#include <string.h>
+
#include <limits>
namespace webrtc {
diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
index b228f3d..c085cfc 100644
--- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
@@ -14,7 +14,7 @@
// MSVC++ requires this to be set before any other includes to get M_PI.
#define _USE_MATH_DEFINES
-#include <cmath>
+#include <math.h>
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc
index b7cacfa..d38263c 100644
--- a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc
+++ b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.cc
@@ -13,7 +13,7 @@
#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
-#include <cmath>
+#include <math.h>
namespace webrtc {
diff --git a/webrtc/common_video/jpeg/jpeg_unittest.cc b/webrtc/common_video/jpeg/jpeg_unittest.cc
index afe9833..e19ca5b 100644
--- a/webrtc/common_video/jpeg/jpeg_unittest.cc
+++ b/webrtc/common_video/jpeg/jpeg_unittest.cc
@@ -8,7 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
+#include <stdio.h>
+
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/common_video/plane.cc b/webrtc/common_video/plane.cc
index 7d87930..68d32cd 100644
--- a/webrtc/common_video/plane.cc
+++ b/webrtc/common_video/plane.cc
@@ -10,8 +10,9 @@
#include "webrtc/common_video/plane.h"
+#include <string.h> // memcpy
+
#include <algorithm> // swap
-#include <cstring> // memcpy
namespace webrtc {
diff --git a/webrtc/modules/audio_coding/main/source/nack.cc b/webrtc/modules/audio_coding/main/source/nack.cc
index f42e4d4..ec6cb3d 100644
--- a/webrtc/modules/audio_coding/main/source/nack.cc
+++ b/webrtc/modules/audio_coding/main/source/nack.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/audio_coding/main/source/nack.h"
+#include <assert.h> // For assert.
+
#include <algorithm> // For std::max.
-#include <cassert> // For assert.
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/logging.h"
diff --git a/webrtc/modules/audio_coding/main/test/APITest.cc b/webrtc/modules/audio_coding/main/test/APITest.cc
index 8b09e12..90f88e3 100644
--- a/webrtc/modules/audio_coding/main/test/APITest.cc
+++ b/webrtc/modules/audio_coding/main/test/APITest.cc
@@ -10,11 +10,11 @@
#include "webrtc/modules/audio_coding/main/test/APITest.h"
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cctype>
#include <iostream>
#include <ostream>
#include <string>
diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.cc b/webrtc/modules/audio_coding/main/test/PCMFile.cc
index 5c4b98e..b7e65dd 100644
--- a/webrtc/modules/audio_coding/main/test/PCMFile.cc
+++ b/webrtc/modules/audio_coding/main/test/PCMFile.cc
@@ -10,7 +10,7 @@
#include "PCMFile.h"
-#include <cctype>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.h b/webrtc/modules/audio_coding/main/test/PCMFile.h
index e3fdcd8..e7387a6 100644
--- a/webrtc/modules/audio_coding/main/test/PCMFile.h
+++ b/webrtc/modules/audio_coding/main/test/PCMFile.h
@@ -11,8 +11,9 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <string>
#include "module_common_types.h"
diff --git a/webrtc/modules/audio_coding/main/test/TestFEC.cc b/webrtc/modules/audio_coding/main/test/TestFEC.cc
index 6cb4eff..66c9441 100644
--- a/webrtc/modules/audio_coding/main/test/TestFEC.cc
+++ b/webrtc/modules/audio_coding/main/test/TestFEC.cc
@@ -10,7 +10,8 @@
#include "TestFEC.h"
-#include <cassert>
+#include <assert.h>
+
#include <iostream>
#include "audio_coding_module_typedefs.h"
diff --git a/webrtc/modules/audio_coding/main/test/TestStereo.cc b/webrtc/modules/audio_coding/main/test/TestStereo.cc
index c5b8f40..741f00b 100644
--- a/webrtc/modules/audio_coding/main/test/TestStereo.cc
+++ b/webrtc/modules/audio_coding/main/test/TestStereo.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/audio_coding/main/test/TestStereo.h"
-#include <cassert>
+#include <assert.h>
+
#include <string>
#include "gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/main/test/TimedTrace.h b/webrtc/modules/audio_coding/main/test/TimedTrace.h
index 1c893fb..237b329 100644
--- a/webrtc/modules/audio_coding/main/test/TimedTrace.h
+++ b/webrtc/modules/audio_coding/main/test/TimedTrace.h
@@ -13,8 +13,8 @@
#include "typedefs.h"
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
class TimedTrace {
public:
diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
index 9c896f9..1bf8879 100644
--- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
+++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
@@ -10,7 +10,7 @@
#include "TwoWayCommunication.h"
-#include <cctype>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/modules/audio_coding/main/test/delay_test.cc b/webrtc/modules/audio_coding/main/test/delay_test.cc
index bfe6128..d647b1f 100644
--- a/webrtc/modules/audio_coding/main/test/delay_test.cc
+++ b/webrtc/modules/audio_coding/main/test/delay_test.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include <assert.h>
#include <math.h>
-#include <cassert>
#include <iostream>
#include "gflags/gflags.h"
diff --git a/webrtc/modules/audio_coding/main/test/iSACTest.cc b/webrtc/modules/audio_coding/main/test/iSACTest.cc
index b2b0fca..64931d5 100644
--- a/webrtc/modules/audio_coding/main/test/iSACTest.cc
+++ b/webrtc/modules/audio_coding/main/test/iSACTest.cc
@@ -10,14 +10,14 @@
#include "webrtc/modules/audio_coding/main/test/iSACTest.h"
-#include <cctype>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
#if _WIN32
#include <windows.h>
#elif WEBRTC_LINUX
-#include <ctime>
+#include <time.h>
#else
#include <sys/time.h>
#include <time.h>
diff --git a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
index 618ccb5..ea2e1ca 100644
--- a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
+++ b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include <assert.h>
#include <math.h>
-#include <cassert>
#include <iostream>
#include "gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/main/test/opus_test.cc b/webrtc/modules/audio_coding/main/test/opus_test.cc
index 36aa355..73507f8 100644
--- a/webrtc/modules/audio_coding/main/test/opus_test.cc
+++ b/webrtc/modules/audio_coding/main/test/opus_test.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/audio_coding/main/test/opus_test.h"
-#include <cassert>
+#include <assert.h>
+
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc
index b3003ed..bbfcdf9 100644
--- a/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc
+++ b/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc
@@ -35,14 +35,14 @@
#include <vector>
#ifdef WIN32
-#include <cassert>
+#include <assert.h>
#include <windows.h>
#endif
#ifdef WEBRTC_LINUX
-#include <netinet/in.h>
+#include <assert.h>
#include <libgen.h>
-#include <cassert>
+#include <netinet/in.h>
#endif
//#include "vld.h"
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
index a5e65b6..46b9cd1 100644
--- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
@@ -11,12 +11,12 @@
//TODO(hlundin): Reformat file to meet style guide.
/* header includes */
-#include "typedefs.h"
#include "stdio.h"
+#include "typedefs.h"
#include "webrtc_neteq.h" // needed for enum WebRtcNetEQDecoder
-#include <string.h>
+#include <assert.h>
#include <stdlib.h>
-#include <cassert>
+#include <string.h>
#ifdef WIN32
#include <winsock2.h>
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
index 248556a..b80c829 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
+++ b/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
@@ -11,8 +11,7 @@
#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
#include <assert.h>
-
-#include <cstring> // memmove
+#include <string.h> // memmove
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
#include "webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h"
diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
index 5f933d9..7167c67 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
+++ b/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.h b/webrtc/modules/audio_coding/neteq4/audio_vector.h
index 6081cd8..3fd2369 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_vector.h
+++ b/webrtc/modules/audio_coding/neteq4/audio_vector.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
+
#include <vector>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.cc b/webrtc/modules/audio_coding/neteq4/background_noise.cc
index 7ab5ead..4b46e6f 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise.cc
+++ b/webrtc/modules/audio_coding/neteq4/background_noise.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
#include <assert.h>
+#include <string.h> // memcpy
#include <algorithm> // min, max
-#include <cstring> // memcpy
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.h b/webrtc/modules/audio_coding/neteq4/background_noise.h
index 6aa643b..85e6177 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise.h
+++ b/webrtc/modules/audio_coding/neteq4/background_noise.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
-#include <cstring> // size_t
+#include <string.h> // size_t
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
index febdb83..ddaf08d 100644
--- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
@@ -12,7 +12,7 @@
#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include <cmath> // Access to pow function.
+#include <math.h> // Access to pow function.
#include "gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.h b/webrtc/modules/audio_coding/neteq4/delay_manager.h
index 9d385e7..d46924f 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_manager.h
+++ b/webrtc/modules/audio_coding/neteq4/delay_manager.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
-#include <cstring> // Provide access to size_t.
+#include <string.h> // Provide access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
index daa41a1..dfdd253 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
+++ b/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
-#include <cstring> // size_t
+#include <string.h> // size_t
+
#include <list>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc b/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
index ebb3966..f972fc5 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
+++ b/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
#include <assert.h>
+#include <string.h> // Access to memset.
#include <algorithm> // Access to min, max.
-#include <cstring> // Access to memset.
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.h b/webrtc/modules/audio_coding/neteq4/dsp_helper.h
index 947824f..7fe1cbb 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper.h
+++ b/webrtc/modules/audio_coding/neteq4/dsp_helper.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
index acd0843..393648c 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
@@ -12,7 +12,7 @@
#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
-#include <cmath>
+#include <math.h>
#include "gtest/gtest.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/expand.cc b/webrtc/modules/audio_coding/neteq4/expand.cc
index 1e196c9..8719abe 100644
--- a/webrtc/modules/audio_coding/neteq4/expand.cc
+++ b/webrtc/modules/audio_coding/neteq4/expand.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/expand.h"
#include <assert.h>
+#include <string.h> // memset
#include <algorithm> // min, max
-#include <cstring> // memset
#include <limits> // numeric_limits<T>
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
diff --git a/webrtc/modules/audio_coding/neteq4/interface/neteq.h b/webrtc/modules/audio_coding/neteq4/interface/neteq.h
index 2766565..59e5bab 100644
--- a/webrtc/modules/audio_coding/neteq4/interface/neteq.h
+++ b/webrtc/modules/audio_coding/neteq4/interface/neteq.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
-#include <cstring> // Provide access to size_t.
+#include <string.h> // Provide access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
diff --git a/webrtc/modules/audio_coding/neteq4/merge.cc b/webrtc/modules/audio_coding/neteq4/merge.cc
index 5c081fe..c15fc34 100644
--- a/webrtc/modules/audio_coding/neteq4/merge.cc
+++ b/webrtc/modules/audio_coding/neteq4/merge.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/merge.h"
#include <assert.h>
+#include <string.h> // memmove, memcpy, memset, size_t
#include <algorithm> // min, max
-#include <cstring> // memmove, memcpy, memset, size_t
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/normal.cc b/webrtc/modules/audio_coding/neteq4/normal.cc
index ddbea4c..353c51b 100644
--- a/webrtc/modules/audio_coding/neteq4/normal.cc
+++ b/webrtc/modules/audio_coding/neteq4/normal.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/audio_coding/neteq4/normal.h"
+#include <string.h> // memset, memcpy
+
#include <algorithm> // min
-#include <cstring> // memset, memcpy
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
diff --git a/webrtc/modules/audio_coding/neteq4/normal.h b/webrtc/modules/audio_coding/neteq4/normal.h
index aba55c4..23fcca5 100644
--- a/webrtc/modules/audio_coding/neteq4/normal.h
+++ b/webrtc/modules/audio_coding/neteq4/normal.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.h b/webrtc/modules/audio_coding/neteq4/random_vector.h
index a456b17..64cfe0d 100644
--- a/webrtc/modules/audio_coding/neteq4/random_vector.h
+++ b/webrtc/modules/audio_coding/neteq4/random_vector.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
-#include <cstring> // size_t
+#include <string.h> // size_t
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
index 9355204..b6e9222 100644
--- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
+++ b/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
@@ -11,8 +11,7 @@
#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
#include <assert.h>
-
-#include <cstring> // memset
+#include <string.h> // memset
#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
index 370fc05..7368b02 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
@@ -21,7 +21,7 @@
#include <netinet/in.h>
#endif
-#include <cassert>
+#include <assert.h>
#include "webrtc/typedefs.h"
// needed for NetEqDecoder
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
index 301ceb6..79af181 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
+++ b/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
@@ -23,7 +23,7 @@
#include <netinet/in.h>
#endif
-#include <cassert>
+#include <assert.h>
#include "gtest/gtest.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.h b/webrtc/modules/audio_coding/neteq4/time_stretch.h
index e701e26..e80c02c 100644
--- a/webrtc/modules/audio_coding/neteq4/time_stretch.h
+++ b/webrtc/modules/audio_coding/neteq4/time_stretch.h
@@ -12,8 +12,7 @@
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
#include <assert.h>
-
-#include <cstring> // memset, size_t
+#include <string.h> // memset, size_t
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
index b296cd3..de51ff8 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
+++ b/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
-#include <cstdio>
+#include <stdio.h>
+
#include <string>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
index 1c8a870..c5abdf7 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
+++ b/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <assert.h>
+#include <stdio.h>
+
#include <algorithm>
-#include <cassert>
-#include <cstdio>
#include <iostream>
#include <string>
diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc
index 63218dd..e3ceb56 100644
--- a/webrtc/modules/audio_device/audio_device_buffer.cc
+++ b/webrtc/modules/audio_device/audio_device_buffer.cc
@@ -14,7 +14,7 @@
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
-#include <cassert>
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/webrtc/modules/audio_device/audio_device_utility.cc b/webrtc/modules/audio_device/audio_device_utility.cc
index b272c7e..b6c5c48 100644
--- a/webrtc/modules/audio_device/audio_device_utility.cc
+++ b/webrtc/modules/audio_device/audio_device_utility.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_device/audio_device_utility.h"
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
index b2e8702..8181fe5 100644
--- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
index 04de0c6..486f67e 100644
--- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_utility.h"
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
index a70b8e2..df9dcab 100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
index 9538912..1ee94cd 100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h"
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc
index 3e669ee..61b41cf 100644
--- a/webrtc/modules/audio_device/mac/audio_device_mac.cc
+++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc
@@ -18,7 +18,7 @@
#include "webrtc/system_wrappers/interface/trace.h"
#include <ApplicationServices/ApplicationServices.h>
-#include <cassert>
+#include <assert.h>
#include <libkern/OSAtomic.h> // OSAtomicCompareAndSwap()
#include <mach/mach.h> // mach_task_self()
#include <sys/sysctl.h> // sysctlbyname()
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index 88db818..fb25cdd 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cmath>
+#include <math.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/modules/audio_device/test/func_test_manager.cc b/webrtc/modules/audio_device/test/func_test_manager.cc
index 018d49a..12a4bad 100644
--- a/webrtc/modules/audio_device/test/func_test_manager.cc
+++ b/webrtc/modules/audio_device/test/func_test_manager.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.cc b/webrtc/modules/audio_device/win/audio_device_wave_win.cc
index 6efd6e1..b48ddfc 100644
--- a/webrtc/modules/audio_device/win/audio_device_wave_win.cc
+++ b/webrtc/modules/audio_device/win/audio_device_wave_win.cc
@@ -19,7 +19,7 @@
#include <windows.h>
#include <objbase.h> // CoTaskMemAlloc, CoTaskMemFree
#include <strsafe.h> // StringCchCopy(), StringCchCat(), StringCchPrintf()
-#include <cassert>
+#include <assert.h>
// Avoids the need of Windows 7 SDK
#ifndef WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE
diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
index 80f43cd..7b5aa69 100644
--- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
+++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
@@ -11,7 +11,7 @@
#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h"
#include "webrtc/system_wrappers/interface/trace.h"
-#include <cassert> // assert()
+#include <assert.h> // assert()
#include <strsafe.h> // StringCchCopy(), StringCchCat(), StringCchPrintf()
#ifdef _WIN32
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc
index 4861df0..469efd3 100644
--- a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc
+++ b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc
@@ -12,8 +12,8 @@
#include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h"
-#include <cstdlib>
-#include <ctime>
+#include <stdlib.h>
+#include <time.h>
extern "C" {
#include "webrtc/modules/audio_processing/aec/aec_core.h"
diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc
index af8f907..f785381 100644
--- a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc
+++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/audio_processing/echo_control_mobile_impl.h"
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
#include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h"
#include "webrtc/modules/audio_processing/audio_buffer.h"
diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/webrtc/modules/audio_processing/gain_control_impl.cc
index e910e41..3554703 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.cc
+++ b/webrtc/modules/audio_processing/gain_control_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/audio_processing/gain_control_impl.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_processing/agc/include/gain_control.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/audio_processing/high_pass_filter_impl.cc b/webrtc/modules/audio_processing/high_pass_filter_impl.cc
index 82e87c8..da21703 100644
--- a/webrtc/modules/audio_processing/high_pass_filter_impl.cc
+++ b/webrtc/modules/audio_processing/high_pass_filter_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/audio_processing/high_pass_filter_impl.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/webrtc/modules/audio_processing/noise_suppression_impl.cc
index 0314ceb..41c11b1 100644
--- a/webrtc/modules/audio_processing/noise_suppression_impl.cc
+++ b/webrtc/modules/audio_processing/noise_suppression_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/audio_processing/noise_suppression_impl.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#if defined(WEBRTC_NS_FLOAT)
diff --git a/webrtc/modules/audio_processing/processing_component.cc b/webrtc/modules/audio_processing/processing_component.cc
index c34c976..23bf225 100644
--- a/webrtc/modules/audio_processing/processing_component.cc
+++ b/webrtc/modules/audio_processing/processing_component.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/audio_processing/processing_component.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/audio_processing/audio_processing_impl.h"
diff --git a/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
index 365eb2d..2b7634d 100644
--- a/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
+++ b/webrtc/modules/audio_processing/utility/ring_buffer_unittest.cc
@@ -14,8 +14,8 @@
#include "webrtc/modules/audio_processing/utility/ring_buffer.h"
}
-#include <cstdlib>
-#include <ctime>
+#include <stdlib.h>
+#include <time.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
@@ -51,9 +51,9 @@
const int kNumOps = 10000;
const int kMaxBufferSize = 1000;
- unsigned int seed = std::time(NULL);
+ unsigned int seed = time(NULL);
printf("seed=%u\n", seed);
- std::srand(seed);
+ srand(seed);
for (int i = 0; i < kNumTests; i++) {
const int buffer_size = std::max(rand() % kMaxBufferSize, 1);
scoped_array<int> write_data(new int[buffer_size]);
diff --git a/webrtc/modules/audio_processing/voice_detection_impl.cc b/webrtc/modules/audio_processing/voice_detection_impl.cc
index f29767c..d41547c 100644
--- a/webrtc/modules/audio_processing/voice_detection_impl.cc
+++ b/webrtc/modules/audio_processing/voice_detection_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/audio_processing/voice_detection_impl.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/common_audio/vad/include/webrtc_vad.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/desktop_capture/desktop_region.cc b/webrtc/modules/desktop_capture/desktop_region.cc
index a5b8ff6..77e0472 100644
--- a/webrtc/modules/desktop_capture/desktop_region.cc
+++ b/webrtc/modules/desktop_capture/desktop_region.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/desktop_capture/desktop_region.h"
+#include <assert.h>
+
#include <algorithm>
-#include <cassert>
namespace webrtc {
diff --git a/webrtc/modules/desktop_capture/window_capturer_linux.cc b/webrtc/modules/desktop_capture/window_capturer_linux.cc
index 5229009..e95cad8 100755
--- a/webrtc/modules/desktop_capture/window_capturer_linux.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_linux.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/desktop_capture/window_capturer.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/desktop_capture/desktop_frame.h"
diff --git a/webrtc/modules/desktop_capture/window_capturer_mac.cc b/webrtc/modules/desktop_capture/window_capturer_mac.cc
index a372c3b..3cfde7c 100755
--- a/webrtc/modules/desktop_capture/window_capturer_mac.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_mac.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/desktop_capture/window_capturer.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/desktop_capture/desktop_frame.h"
diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc
index 97d1d27..089a877 100644
--- a/webrtc/modules/desktop_capture/window_capturer_win.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_win.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/desktop_capture/window_capturer.h"
-#include <cassert>
+#include <assert.h>
#include <windows.h>
#include "webrtc/modules/desktop_capture/desktop_frame_win.h"
diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc
index 2f2a80f..88f7738 100644
--- a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc
+++ b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
-#include <cassert>
+#include <assert.h>
#include <sys/shm.h>
#include "webrtc/system_wrappers/interface/logging.h"
diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h
index 57a1dfb..e40adfc 100644
--- a/webrtc/modules/interface/module_common_types.h
+++ b/webrtc/modules/interface/module_common_types.h
@@ -11,8 +11,8 @@
#ifndef MODULE_COMMON_TYPES_H
#define MODULE_COMMON_TYPES_H
-#include <cassert>
-#include <cstring> // memcpy
+#include <assert.h>
+#include <string.h> // memcpy
#include <algorithm>
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc b/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc
index d07b7d8..1f5fe42 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_rate_control.cc
@@ -10,10 +10,11 @@
#include "webrtc/modules/remote_bitrate_estimator/remote_rate_control.h"
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+
#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <cstring>
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
index d2635e8..a892386 100644
--- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
+++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -10,9 +10,10 @@
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
+#include <assert.h>
+#include <string.h>
+
#include <algorithm>
-#include <cassert>
-#include <cstring>
#include <iterator>
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc
index f718f31..6d9be90 100644
--- a/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc
+++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
#include "webrtc/modules/rtp_rtcp/source/fec_private_tables_bursty.h"
#include "webrtc/modules/rtp_rtcp/source/fec_private_tables_random.h"
diff --git a/webrtc/modules/rtp_rtcp/source/receiver_fec.cc b/webrtc/modules/rtp_rtcp/source/receiver_fec.cc
index e99cd4d..378d3a3 100644
--- a/webrtc/modules/rtp_rtcp/source/receiver_fec.cc
+++ b/webrtc/modules/rtp_rtcp/source/receiver_fec.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/receiver_fec.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 5e2f5ba..871a089 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
-#include <cassert> //assert
+#include <assert.h> //assert
#include <string.h> //memset
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc
index 1ad734c..be07c4e 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h"
-#include <cassert> // assert
+#include <assert.h> // assert
#include <string.h> // memset
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
index c7bd5ac..78f1789 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -10,11 +10,12 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
-#include <algorithm> // min
-#include <cassert> // assert
-#include <cstdlib> // rand
+#include <assert.h> // assert
+#include <stdlib.h> // rand
#include <string.h> // memcpy
+#include <algorithm> // min
+
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc
index 0e6a221..8a9e1c5 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_utility.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
-#include <cassert>
-#include <cmath> // ceil
-#include <cstring> // memcpy
+#include <assert.h>
+#include <math.h> // ceil
+#include <string.h> // memcpy
namespace webrtc {
// RTCPParserV2 : currently read only
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_utility.h b/webrtc/modules/rtp_rtcp/source/rtcp_utility.h
index 606384a..fa771ab 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_utility.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_utility.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_
-#include <cstddef> // size_t, ptrdiff_t
+#include <stddef.h> // size_t, ptrdiff_t
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc
index 4eb4cd6..360176b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h"
+#include <assert.h> // assert
#include <string.h> // memcpy
-#include <cassert> // assert
#include <vector>
#include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
index daf7e1f..2e72d75 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extension.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc
index c657c92..56eba3b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc
@@ -11,7 +11,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h"
#include <assert.h>
-#include <cstring> // memset
+#include <string.h> // memset
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc
index 4fc557f..4762089 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver.h"
-#include <cassert>
+#include <assert.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc
index 130ca8a..865add4 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc
@@ -10,10 +10,9 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h"
+#include <assert.h> // assert
#include <math.h> // pow()
-
-#include <cassert> // assert
-#include <cstring> // memcpy()
+#include <string.h> // memcpy()
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc
index 509d4fe..2b5226a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
-#include <cstdlib>
+#include <stdlib.h>
namespace webrtc {
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc
index b5e8662..9465d22 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc
@@ -12,8 +12,8 @@
#include <math.h>
-#include <cassert> // assert
-#include <cstring> // memcpy()
+#include <assert.h> // assert
+#include <string.h> // memcpy()
#include "webrtc/modules/rtp_rtcp/source/receiver_fec.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 55c1659..5c7f85e 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
-#include <cassert>
+#include <assert.h>
#include <string.h>
#include "webrtc/common_types.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
index 5b6f574..20dfb22 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
-#include <cstdlib> // srand
+#include <stdlib.h> // srand
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h
index eef2440..91041fa 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h
@@ -11,8 +11,9 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
-#include <cassert>
-#include <cmath>
+#include <assert.h>
+#include <math.h>
+
#include <map>
#include "webrtc/common_types.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
index 55f6c15..f800142 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h"
-#include <cassert> //assert
+#include <assert.h> //assert
#include <string.h> //memcpy
#include "webrtc/system_wrappers/interface/trace_event.h"
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
index 4a3a143..ca2e0af 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include <cassert>
-#include <cmath> // ceil
-#include <cstring> // memcpy
+#include <assert.h>
+#include <math.h> // ceil
+#include <string.h> // memcpy
#if defined(_WIN32)
// Order for these headers are important
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.h b/webrtc/modules/rtp_rtcp/source/rtp_utility.h
index 3bae732..c2b3c25 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_
-#include <cstddef> // size_t, ptrdiff_t
+#include <stddef.h> // size_t, ptrdiff_t
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h"
diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc
index 336d183..8896b68 100644
--- a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc
+++ b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc
@@ -13,11 +13,12 @@
* functions in ForwardErrorCorrection directly.
*/
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
#include <list>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/modules/utility/source/rtp_dump_impl.cc b/webrtc/modules/utility/source/rtp_dump_impl.cc
index d7c112f..1f8715d 100644
--- a/webrtc/modules/utility/source/rtp_dump_impl.cc
+++ b/webrtc/modules/utility/source/rtp_dump_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/utility/source/rtp_dump_impl.h"
-#include <cassert>
+#include <assert.h>
#include <stdio.h>
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/utility/source/video_frames_queue.cc b/webrtc/modules/utility/source/video_frames_queue.cc
index 7d6ea34..535660c 100644
--- a/webrtc/modules/utility/source/video_frames_queue.cc
+++ b/webrtc/modules/utility/source/video_frames_queue.cc
@@ -12,7 +12,7 @@
#ifdef WEBRTC_MODULE_UTILITY_VIDEO
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc
index cff3ac7..0583e9e 100644
--- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc
+++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h"
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
namespace webrtc {
namespace test {
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h
index 75550a0..0fafa22 100644
--- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h
+++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_
#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_PACKET_MANIPULATOR_H_
-#include <cstdlib>
+#include <stdlib.h>
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc
index 03920ff..c92cfa4 100644
--- a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc
+++ b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc
@@ -10,8 +10,8 @@
#include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h"
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
#include "webrtc/test/testsupport/packet_reader.h"
diff --git a/webrtc/modules/video_coding/codecs/test/stats.cc b/webrtc/modules/video_coding/codecs/test/stats.cc
index 17a88af..f6605f9 100644
--- a/webrtc/modules/video_coding/codecs/test/stats.cc
+++ b/webrtc/modules/video_coding/codecs/test/stats.cc
@@ -10,9 +10,10 @@
#include "webrtc/modules/video_coding/codecs/test/stats.h"
+#include <assert.h>
+#include <stdio.h>
+
#include <algorithm> // min_element, max_element
-#include <cassert>
-#include <cstdio>
namespace webrtc {
namespace test {
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
index 0409128..30ee6a8 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/video_coding/codecs/test/videoprocessor.h"
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
+
#include <limits>
#include <vector>
diff --git a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc
index 1118937..c69803f 100644
--- a/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/benchmark.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/video_coding/codecs/test_framework/benchmark.h"
-#include <cassert>
+#include <assert.h>
+
#include <iostream>
#include <sstream>
#include <vector>
diff --git a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc
index 58e9eb8..6bb7bbe 100644
--- a/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.cc
@@ -8,9 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
-#include <sstream>
+#include <assert.h>
#include <string.h>
+
+#include <sstream>
+
#include "webrtc/modules/video_coding/codecs/test_framework/packet_loss_test.h"
#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h"
diff --git a/webrtc/modules/video_coding/codecs/test_framework/test.cc b/webrtc/modules/video_coding/codecs/test_framework/test.cc
index 1501b5f..2d55f02 100644
--- a/webrtc/modules/video_coding/codecs/test_framework/test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/test.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/video_coding/codecs/test_framework/test.h"
-#include <cstring>
+#include <string.h>
+
#include <iostream>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -31,7 +32,7 @@
{
memset(&_inst, 0, sizeof(_inst));
unsigned int seed = static_cast<unsigned int>(0);
- std::srand(seed);
+ srand(seed);
}
CodecTest::CodecTest(std::string name, std::string description,
@@ -46,7 +47,7 @@
{
memset(&_inst, 0, sizeof(_inst));
unsigned int seed = static_cast<unsigned int>(0);
- std::srand(seed);
+ srand(seed);
}
void
diff --git a/webrtc/modules/video_coding/codecs/test_framework/test.h b/webrtc/modules/video_coding/codecs/test_framework/test.h
index 69b6aba..890d0cb 100644
--- a/webrtc/modules/video_coding/codecs/test_framework/test.h
+++ b/webrtc/modules/video_coding/codecs/test_framework/test.h
@@ -11,9 +11,11 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_
#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_FRAWEWORK_TEST_H_
-#include <cstdlib>
+#include <stdlib.h>
+
#include <fstream>
#include <string>
+
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
diff --git a/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc b/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc
index 9c9bb3b..0fdd447 100644
--- a/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc
+++ b/webrtc/modules/video_coding/codecs/test_framework/unit_test.cc
@@ -8,12 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <assert.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include <cassert>
-
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/video_coding/codecs/test_framework/unit_test.h"
#include "webrtc/modules/video_coding/codecs/test_framework/video_source.h"
diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
index 2c6c17d..7a12446 100644
--- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
+++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <assert.h>
+#include <stdio.h>
+#include <time.h>
+
#include <stdarg.h>
#include <sys/stat.h> // To check for directory existence.
-#include <cassert>
-#include <cstdio>
-#include <ctime>
-
#ifndef S_ISDIR // Not defined in stat.h on Windows.
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
#endif
diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
index 42ddec3..ec0b5c6 100644
--- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
@@ -9,7 +9,7 @@
#include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h"
-#include <cassert>
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.cc b/webrtc/modules/video_coding/main/source/frame_buffer.cc
index 167b052..32481e2 100644
--- a/webrtc/modules/video_coding/main/source/frame_buffer.cc
+++ b/webrtc/modules/video_coding/main/source/frame_buffer.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_coding/main/source/frame_buffer.h"
-#include <cassert>
+#include <assert.h>
#include <string.h>
#include "webrtc/modules/video_coding/main/source/packet.h"
diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/main/source/jitter_buffer.cc
index add2ec3..17218f8 100644
--- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc
+++ b/webrtc/modules/video_coding/main/source/jitter_buffer.cc
@@ -9,8 +9,9 @@
*/
#include "webrtc/modules/video_coding/main/source/jitter_buffer.h"
+#include <assert.h>
+
#include <algorithm>
-#include <cassert>
#include <utility>
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.h b/webrtc/modules/video_coding/main/source/media_opt_util.h
index d52da15..f39a578 100644
--- a/webrtc/modules/video_coding/main/source/media_opt_util.h
+++ b/webrtc/modules/video_coding/main/source/media_opt_util.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_
#define WEBRTC_MODULES_VIDEO_CODING_MEDIA_OPT_UTIL_H_
-#include <cmath>
-#include <cstdlib>
+#include <math.h>
+#include <stdlib.h>
#include "webrtc/modules/video_coding/main/source/internal_defines.h"
#include "webrtc/modules/video_coding/main/source/qm_select.h"
diff --git a/webrtc/modules/video_coding/main/source/rtt_filter.cc b/webrtc/modules/video_coding/main/source/rtt_filter.cc
index e609592..25d89e5 100644
--- a/webrtc/modules/video_coding/main/source/rtt_filter.cc
+++ b/webrtc/modules/video_coding/main/source/rtt_filter.cc
@@ -12,7 +12,7 @@
#include "webrtc/modules/video_coding/main/source/rtt_filter.h"
#include "webrtc/system_wrappers/interface/trace.h"
-#include <cmath>
+#include <math.h>
#include <stdlib.h>
#include <string.h>
diff --git a/webrtc/modules/video_coding/main/source/timing_unittest.cc b/webrtc/modules/video_coding/main/source/timing_unittest.cc
index 496946e..dde26a9 100644
--- a/webrtc/modules/video_coding/main/source/timing_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/timing_unittest.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
diff --git a/webrtc/modules/video_coding/main/test/generic_codec_test.cc b/webrtc/modules/video_coding/main/test/generic_codec_test.cc
index 1a9ca39..925f9ab 100644
--- a/webrtc/modules/video_coding/main/test/generic_codec_test.cc
+++ b/webrtc/modules/video_coding/main/test/generic_codec_test.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_coding/main/test/generic_codec_test.h"
-#include <cmath>
+#include <math.h>
#include <stdio.h>
#include "webrtc/common_video/interface/i420_video_frame.h"
diff --git a/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc b/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc
index ee1c0b0..25ef686 100644
--- a/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc
+++ b/webrtc/modules/video_coding/main/test/jitter_estimate_test.cc
@@ -9,7 +9,7 @@
*/
#include <stdio.h>
-#include <ctime>
+#include <time.h>
#include "JitterEstimateTest.h"
using namespace webrtc;
@@ -25,8 +25,8 @@
_lossrate(0.0)
{
// Assign to random value between 0 and max of unsigned int
- _seed = static_cast<unsigned>(std::time(0));
- std::srand(_seed);
+ _seed = static_cast<unsigned>(time(0));
+ srand(_seed);
_prevTimestamp = static_cast<unsigned int>((std::rand() + 1.0)/(RAND_MAX + 1.0)*(pow((float) 2, (long) sizeof(unsigned int)*8)-1));
_prevWallClock = VCMTickTime::MillisecondTimestamp();
}
diff --git a/webrtc/modules/video_coding/main/test/jitter_estimate_test.h b/webrtc/modules/video_coding/main/test/jitter_estimate_test.h
index ec9fdeb..086ec0c 100644
--- a/webrtc/modules/video_coding/main/test/jitter_estimate_test.h
+++ b/webrtc/modules/video_coding/main/test/jitter_estimate_test.h
@@ -14,8 +14,8 @@
#include "typedefs.h"
#include "jitter_buffer.h"
#include "jitter_estimator.h"
-#include <cstdlib>
-#include <cmath>
+#include <stdlib.h>
+#include <math.h>
double const pi = 4*std::atan(1.0);
@@ -28,7 +28,7 @@
{
double r1 = (std::rand() + 1.0)/(RAND_MAX + 1.0); // gives equal distribution in (0, 1]
double r2 = (std::rand() + 1.0)/(RAND_MAX + 1.0);
- return _mu + _sigma * std::sqrt(-2*std::log(r1))*std::cos(2*pi*r2);
+ return _mu + _sigma * sqrt(-2*std::log(r1))*std::cos(2*pi*r2);
}
double GetAverage()
diff --git a/webrtc/modules/video_coding/main/test/mt_test_common.cc b/webrtc/modules/video_coding/main/test/mt_test_common.cc
index 04b180d..3b45089 100644
--- a/webrtc/modules/video_coding/main/test/mt_test_common.cc
+++ b/webrtc/modules/video_coding/main/test/mt_test_common.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_coding/main/test/mt_test_common.h"
-#include <cmath>
+#include <math.h>
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
#include "webrtc/modules/utility/interface/rtp_dump.h"
diff --git a/webrtc/modules/video_coding/main/test/pcap_file_reader.cc b/webrtc/modules/video_coding/main/test/pcap_file_reader.cc
index 326fab8..3d4e265 100644
--- a/webrtc/modules/video_coding/main/test/pcap_file_reader.cc
+++ b/webrtc/modules/video_coding/main/test/pcap_file_reader.cc
@@ -16,8 +16,9 @@
#else
#include <arpa/inet.h>
#endif
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
+
#include <map>
#include <string>
#include <vector>
diff --git a/webrtc/modules/video_coding/main/test/rtp_file_reader.cc b/webrtc/modules/video_coding/main/test/rtp_file_reader.cc
index f1921e9..447eb9b 100644
--- a/webrtc/modules/video_coding/main/test/rtp_file_reader.cc
+++ b/webrtc/modules/video_coding/main/test/rtp_file_reader.cc
@@ -16,8 +16,8 @@
#else
#include <arpa/inet.h>
#endif
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
#include "webrtc/modules/video_coding/main/test/rtp_player.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
diff --git a/webrtc/modules/video_coding/main/test/rtp_player.cc b/webrtc/modules/video_coding/main/test/rtp_player.cc
index 0e440da..94957e9 100644
--- a/webrtc/modules/video_coding/main/test/rtp_player.cc
+++ b/webrtc/modules/video_coding/main/test/rtp_player.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/video_coding/main/test/rtp_player.h"
-#include <cstdio>
+#include <stdio.h>
+
#include <map>
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
diff --git a/webrtc/modules/video_coding/main/test/test_callbacks.cc b/webrtc/modules/video_coding/main/test/test_callbacks.cc
index bbd7aea..4bb1f34 100644
--- a/webrtc/modules/video_coding/main/test/test_callbacks.cc
+++ b/webrtc/modules/video_coding/main/test/test_callbacks.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_coding/main/test/test_callbacks.h"
-#include <cmath>
+#include <math.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
diff --git a/webrtc/modules/video_coding/main/test/test_callbacks.h b/webrtc/modules/video_coding/main/test/test_callbacks.h
index 09275af..9fab776 100644
--- a/webrtc/modules/video_coding/main/test/test_callbacks.h
+++ b/webrtc/modules/video_coding/main/test/test_callbacks.h
@@ -16,10 +16,11 @@
*/
-#include <cstdlib>
+#include <stdlib.h>
+#include <string.h>
+
#include <fstream>
#include <list>
-#include <string.h>
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
diff --git a/webrtc/modules/video_coding/main/test/test_macros.h b/webrtc/modules/video_coding/main/test/test_macros.h
index 31693b5..a8a70ea 100644
--- a/webrtc/modules/video_coding/main/test/test_macros.h
+++ b/webrtc/modules/video_coding/main/test/test_macros.h
@@ -11,8 +11,8 @@
#ifndef VCM_TEST_MACROS_H
#define VCM_TEST_MACROS_H
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
extern int vcmMacrosTests;
extern int vcmMacrosErrors;
diff --git a/webrtc/modules/video_coding/main/test/test_util.cc b/webrtc/modules/video_coding/main/test/test_util.cc
index 159de17..f1b68dc 100644
--- a/webrtc/modules/video_coding/main/test/test_util.cc
+++ b/webrtc/modules/video_coding/main/test/test_util.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/video_coding/main/test/test_util.h"
-#include <cassert>
-#include <cmath>
+#include <assert.h>
+#include <math.h>
+
#include <iomanip>
#include <sstream>
diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
index ccc74e9..23f0f9f 100644
--- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
+++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h"
+#include <assert.h>
+
#include <algorithm>
-#include <cassert>
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
#include "webrtc/modules/video_coding/main/test/test_util.h"
diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc b/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc
index 34f3206..ec1cff4 100644
--- a/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc
+++ b/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/video_coding/main/test/receiver_tests.h"
#include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h"
diff --git a/webrtc/modules/video_coding/main/test/video_source.cc b/webrtc/modules/video_coding/main/test/video_source.cc
index 781ea2c..65ee6a3 100644
--- a/webrtc/modules/video_coding/main/test/video_source.cc
+++ b/webrtc/modules/video_coding/main/test/video_source.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_coding/main/test/video_source.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/modules/video_processing/main/source/brighten.cc b/webrtc/modules/video_processing/main/source/brighten.cc
index 12da574..8fa23c2 100644
--- a/webrtc/modules/video_processing/main/source/brighten.cc
+++ b/webrtc/modules/video_processing/main/source/brighten.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_processing/main/source/brighten.h"
-#include <cstdlib>
+#include <stdlib.h>
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/video_processing/main/source/color_enhancement.cc b/webrtc/modules/video_processing/main/source/color_enhancement.cc
index b524767..87a594b 100644
--- a/webrtc/modules/video_processing/main/source/color_enhancement.cc
+++ b/webrtc/modules/video_processing/main/source/color_enhancement.cc
@@ -8,7 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdlib> // NULL
+#include <stdlib.h> // NULL
+
#include "webrtc/modules/video_processing/main/source/color_enhancement.h"
#include "webrtc/modules/video_processing/main/source/color_enhancement_private.h"
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/modules/video_processing/main/source/deflickering.h b/webrtc/modules/video_processing/main/source/deflickering.h
index 94b0836..d3f8139 100644
--- a/webrtc/modules/video_processing/main/source/deflickering.h
+++ b/webrtc/modules/video_processing/main/source/deflickering.h
@@ -15,11 +15,11 @@
#ifndef VPM_DEFLICKERING_H
#define VPM_DEFLICKERING_H
+#include <string.h> // NULL
+
#include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/typedefs.h"
-#include <cstring> // NULL
-
namespace webrtc {
class VPMDeflickering
diff --git a/webrtc/modules/video_processing/main/source/denoising.cc b/webrtc/modules/video_processing/main/source/denoising.cc
index 42ea268..45326fa 100644
--- a/webrtc/modules/video_processing/main/source/denoising.cc
+++ b/webrtc/modules/video_processing/main/source/denoising.cc
@@ -11,7 +11,7 @@
#include "webrtc/modules/video_processing/main/source/denoising.h"
#include "webrtc/system_wrappers/interface/trace.h"
-#include <cstring>
+#include <string.h>
namespace webrtc {
diff --git a/webrtc/modules/video_processing/main/source/video_processing_impl.cc b/webrtc/modules/video_processing/main/source/video_processing_impl.cc
index 4546f91..8152cd1 100644
--- a/webrtc/modules/video_processing/main/source/video_processing_impl.cc
+++ b/webrtc/modules/video_processing/main/source/video_processing_impl.cc
@@ -13,7 +13,7 @@
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
-#include <cassert>
+#include <assert.h>
namespace webrtc {
diff --git a/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc b/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc
index ea1ed41..c048003 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc
+++ b/webrtc/modules/video_processing/main/test/unit_test/color_enhancement_test.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_processing/main/interface/video_processing.h"
diff --git a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc
index 48afcf5..85f4fd6 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc
+++ b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_processing/main/interface/video_processing.h"
diff --git a/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc b/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc
index 8c47917..8a34393 100644
--- a/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc
+++ b/webrtc/modules/video_processing/main/test/unit_test/denoising_test.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_processing/main/interface/video_processing.h"
diff --git a/webrtc/modules/video_render/incoming_video_stream.cc b/webrtc/modules/video_render/incoming_video_stream.cc
index f3b79fe..eb602d1 100644
--- a/webrtc/modules/video_render/incoming_video_stream.cc
+++ b/webrtc/modules/video_render/incoming_video_stream.cc
@@ -10,13 +10,13 @@
#include "webrtc/modules/video_render//incoming_video_stream.h"
-#include <cassert>
+#include <assert.h>
#if defined(_WIN32)
#include <windows.h>
#elif defined(WEBRTC_LINUX)
-#include <ctime>
#include <sys/time.h>
+#include <time.h>
#else
#include <sys/time.h>
#endif
diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc
index 5f4fd56..9764ae6 100644
--- a/webrtc/modules/video_render/test/testAPI/testAPI.cc
+++ b/webrtc/modules/video_render/test/testAPI/testAPI.cc
@@ -15,7 +15,7 @@
#if defined(_WIN32)
#include <tchar.h>
#include <windows.h>
-#include <cassert>
+#include <assert.h>
#include <fstream>
#include <iostream>
#include <string>
diff --git a/webrtc/modules/video_render/video_render_frames.cc b/webrtc/modules/video_render/video_render_frames.cc
index b0a78b6..80b3d59 100644
--- a/webrtc/modules/video_render/video_render_frames.cc
+++ b/webrtc/modules/video_render/video_render_frames.cc
@@ -10,7 +10,7 @@
#include "webrtc/modules/video_render//video_render_frames.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc
index f484362..7dc0dbf 100644
--- a/webrtc/modules/video_render/video_render_impl.cc
+++ b/webrtc/modules/video_render/video_render_impl.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <assert.h>
+
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/i_video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
@@ -16,8 +18,6 @@
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
-#include <cassert>
-
#ifdef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
#if defined (_WIN32)
diff --git a/webrtc/system_wrappers/interface/atomic32.h b/webrtc/system_wrappers/interface/atomic32.h
index 9a28d41..ab29f97 100644
--- a/webrtc/system_wrappers/interface/atomic32.h
+++ b/webrtc/system_wrappers/interface/atomic32.h
@@ -16,7 +16,7 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ATOMIC32_H_
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ATOMIC32_H_
-#include <cstddef>
+#include <stddef.h>
#include "webrtc/common_types.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/system_wrappers/interface/scoped_ptr.h b/webrtc/system_wrappers/interface/scoped_ptr.h
index 84113d8..cfaf5cb 100644
--- a/webrtc/system_wrappers/interface/scoped_ptr.h
+++ b/webrtc/system_wrappers/interface/scoped_ptr.h
@@ -26,10 +26,9 @@
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_PTR_H_
#include <assert.h> // for assert
+#include <stddef.h> // for ptrdiff_t
#include <stdlib.h> // for free() decl
-#include <cstddef> // for std::ptrdiff_t
-
#ifdef _WIN32
namespace std { using ::ptrdiff_t; };
#endif // _WIN32
@@ -149,7 +148,7 @@
}
}
- T& operator[](std::ptrdiff_t i) const {
+ T& operator[](ptrdiff_t i) const {
assert(ptr != NULL);
assert(i >= 0);
return ptr[i];
diff --git a/webrtc/system_wrappers/interface/tick_util.h b/webrtc/system_wrappers/interface/tick_util.h
index 7e7d799..0b7890e 100644
--- a/webrtc/system_wrappers/interface/tick_util.h
+++ b/webrtc/system_wrappers/interface/tick_util.h
@@ -19,7 +19,7 @@
#include <windows.h>
#include <mmsystem.h>
#elif WEBRTC_LINUX
-#include <ctime>
+#include <time.h>
#elif WEBRTC_MAC
#include <mach/mach_time.h>
#include <string.h>
diff --git a/webrtc/system_wrappers/source/condition_variable_posix.cc b/webrtc/system_wrappers/source/condition_variable_posix.cc
index 846cd63..b213042 100644
--- a/webrtc/system_wrappers/source/condition_variable_posix.cc
+++ b/webrtc/system_wrappers/source/condition_variable_posix.cc
@@ -12,7 +12,7 @@
#include <errno.h>
#if defined(WEBRTC_LINUX)
-#include <ctime>
+#include <time.h>
#else
#include <sys/time.h>
#endif
diff --git a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
index 935f3d6..02d3cdb 100644
--- a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
+++ b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/data_log.h"
-#include <cstdio>
+#include <stdio.h>
#include "testing/gtest/include/gtest/gtest.h"
@@ -44,7 +44,7 @@
TEST(TestDataLogDisabled, EnsureNoFileIsWritten) {
// Remove any previous data files on disk:
- std::remove(kDataLogFileName);
+ remove(kDataLogFileName);
ASSERT_EQ(0, DataLog::CreateLog());
// Don't use the table name we would get from Combine on a disabled DataLog.
// Use "table_1" instead (which is what an enabled DataLog would give us).
diff --git a/webrtc/system_wrappers/source/sort.cc b/webrtc/system_wrappers/source/sort.cc
index c3b61e0..9144a58 100644
--- a/webrtc/system_wrappers/source/sort.cc
+++ b/webrtc/system_wrappers/source/sort.cc
@@ -15,12 +15,13 @@
#include "webrtc/system_wrappers/interface/sort.h"
-#include <cassert>
-#include <cstring> // memcpy
+#include <assert.h>
+#include <string.h> // memcpy
+
#include <new> // nothrow new
#ifdef NO_STL
-#include <cstdlib> // qsort
+#include <stdlib.h> // qsort
#else
#include <algorithm> // std::sort
#include <vector>
diff --git a/webrtc/system_wrappers/source/tick_util.cc b/webrtc/system_wrappers/source/tick_util.cc
index 45302ba..8895b91 100644
--- a/webrtc/system_wrappers/source/tick_util.cc
+++ b/webrtc/system_wrappers/source/tick_util.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/tick_util.h"
-#include <cassert>
+#include <assert.h>
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc
index 83c7377..3a31341 100644
--- a/webrtc/system_wrappers/source/trace_impl.cc
+++ b/webrtc/system_wrappers/source/trace_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/source/trace_impl.h"
-#include <cassert>
+#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/system_wrappers/source/trace_posix.cc b/webrtc/system_wrappers/source/trace_posix.cc
index 664dfeb..22db3fa 100644
--- a/webrtc/system_wrappers/source/trace_posix.cc
+++ b/webrtc/system_wrappers/source/trace_posix.cc
@@ -10,12 +10,13 @@
#include "webrtc/system_wrappers/source/trace_posix.h"
-#include <cassert>
+#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
+
#ifdef WEBRTC_ANDROID
#include <pthread.h>
#else
diff --git a/webrtc/system_wrappers/source/trace_win.cc b/webrtc/system_wrappers/source/trace_win.cc
index 6b82d66..129e3dd 100644
--- a/webrtc/system_wrappers/source/trace_win.cc
+++ b/webrtc/system_wrappers/source/trace_win.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/source/trace_win.h"
-#include <cassert>
+#include <assert.h>
#include <stdarg.h>
#include "Mmsystem.h"
diff --git a/webrtc/system_wrappers/test/TestSort/TestSort.cc b/webrtc/system_wrappers/test/TestSort/TestSort.cc
index 1a3c198..cfa47cf 100644
--- a/webrtc/system_wrappers/test/TestSort/TestSort.cc
+++ b/webrtc/system_wrappers/test/TestSort/TestSort.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdio.h>
+#include <string.h>
+
#include <algorithm>
-#include <cstdio>
-#include <cstring>
#include "webrtc/system_wrappers/interface/sort.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
diff --git a/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc
index 2a43977..2e84c28 100644
--- a/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc
+++ b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc
@@ -10,7 +10,7 @@
#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
-#include <cassert>
+#include <assert.h>
#ifdef _WIN32
#include "webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h"
diff --git a/webrtc/test/libtest/helpers/bit_flip_encryption.cc b/webrtc/test/libtest/helpers/bit_flip_encryption.cc
index cd8841b..6548502 100644
--- a/webrtc/test/libtest/helpers/bit_flip_encryption.cc
+++ b/webrtc/test/libtest/helpers/bit_flip_encryption.cc
@@ -10,7 +10,7 @@
#include "webrtc/test/libtest/include/bit_flip_encryption.h"
-#include <cstdlib>
+#include <stdlib.h>
float NormalizedRand() {
return static_cast<float>(rand()) /
diff --git a/webrtc/test/libtest/helpers/random_encryption.cc b/webrtc/test/libtest/helpers/random_encryption.cc
index befcb01..c07c4b0 100644
--- a/webrtc/test/libtest/helpers/random_encryption.cc
+++ b/webrtc/test/libtest/helpers/random_encryption.cc
@@ -10,9 +10,10 @@
#include "webrtc/test/libtest/include/random_encryption.h"
+#include <math.h>
+#include <stdlib.h>
+
#include <algorithm>
-#include <cmath>
-#include <cstdlib>
#include "webrtc/video_engine/vie_defines.h"
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index d4354d8..d19d50f 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -23,8 +23,8 @@
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
#endif
-#include <cstdio>
-#include <cstring>
+#include <stdio.h>
+#include <string.h>
#include "webrtc/typedefs.h" // For architecture defines
diff --git a/webrtc/test/testsupport/fileutils.h b/webrtc/test/testsupport/fileutils.h
index e642a5f..d51bbde 100644
--- a/webrtc/test/testsupport/fileutils.h
+++ b/webrtc/test/testsupport/fileutils.h
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
+#include <stdio.h>
// File utilities for testing purposes.
//
diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc
index 1fd11bf..c38e453 100644
--- a/webrtc/test/testsupport/fileutils_unittest.cc
+++ b/webrtc/test/testsupport/fileutils_unittest.cc
@@ -10,7 +10,8 @@
#include "webrtc/test/testsupport/fileutils.h"
-#include <cstdio>
+#include <stdio.h>
+
#include <list>
#include <string>
@@ -120,9 +121,9 @@
TEST_F(FileUtilsTest, CreateDirectory) {
std::string directory = "fileutils-unittest-empty-dir";
// Make sure it's removed if a previous test has failed:
- std::remove(directory.c_str());
+ remove(directory.c_str());
ASSERT_TRUE(webrtc::test::CreateDirectory(directory));
- std::remove(directory.c_str());
+ remove(directory.c_str());
}
TEST_F(FileUtilsTest, WorkingDirReturnsValue) {
diff --git a/webrtc/test/testsupport/frame_reader.cc b/webrtc/test/testsupport/frame_reader.cc
index 28896c4..b03616a 100644
--- a/webrtc/test/testsupport/frame_reader.cc
+++ b/webrtc/test/testsupport/frame_reader.cc
@@ -10,7 +10,7 @@
#include "webrtc/test/testsupport/frame_reader.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h
index 8f88a89..4ee90f9 100644
--- a/webrtc/test/testsupport/frame_reader.h
+++ b/webrtc/test/testsupport/frame_reader.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
#define WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
-#include <cstdio>
+#include <stdio.h>
+
#include <string>
#include "webrtc/typedefs.h"
diff --git a/webrtc/test/testsupport/frame_reader_unittest.cc b/webrtc/test/testsupport/frame_reader_unittest.cc
index ea837a7..c70db5b 100644
--- a/webrtc/test/testsupport/frame_reader_unittest.cc
+++ b/webrtc/test/testsupport/frame_reader_unittest.cc
@@ -28,7 +28,7 @@
virtual ~FrameReaderTest() {}
void SetUp() {
// Cleanup any previous dummy input file.
- std::remove(kInputFilename.c_str());
+ remove(kInputFilename.c_str());
// Create a dummy input file.
FILE* dummy = fopen(kInputFilename.c_str(), "wb");
@@ -41,7 +41,7 @@
void TearDown() {
delete frame_reader_;
// Cleanup the dummy input file.
- std::remove(kInputFilename.c_str());
+ remove(kInputFilename.c_str());
}
FrameReader* frame_reader_;
};
diff --git a/webrtc/test/testsupport/frame_writer.cc b/webrtc/test/testsupport/frame_writer.cc
index 1d564bb..1b9e8a8 100644
--- a/webrtc/test/testsupport/frame_writer.cc
+++ b/webrtc/test/testsupport/frame_writer.cc
@@ -10,7 +10,7 @@
#include "webrtc/test/testsupport/frame_writer.h"
-#include <cassert>
+#include <assert.h>
namespace webrtc {
namespace test {
diff --git a/webrtc/test/testsupport/frame_writer.h b/webrtc/test/testsupport/frame_writer.h
index 5cd34dc..daa3894 100644
--- a/webrtc/test/testsupport/frame_writer.h
+++ b/webrtc/test/testsupport/frame_writer.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_
#define WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_
-#include <cstdio>
+#include <stdio.h>
+
#include <string>
#include "webrtc/typedefs.h"
diff --git a/webrtc/test/testsupport/frame_writer_unittest.cc b/webrtc/test/testsupport/frame_writer_unittest.cc
index 0978dff..3e32fef 100644
--- a/webrtc/test/testsupport/frame_writer_unittest.cc
+++ b/webrtc/test/testsupport/frame_writer_unittest.cc
@@ -25,14 +25,14 @@
virtual ~FrameWriterTest() {}
void SetUp() {
// Cleanup any previous output file.
- std::remove(kOutputFilename.c_str());
+ remove(kOutputFilename.c_str());
frame_writer_ = new FrameWriterImpl(kOutputFilename, kFrameLength);
ASSERT_TRUE(frame_writer_->Init());
}
void TearDown() {
delete frame_writer_;
// Cleanup the temporary file.
- std::remove(kOutputFilename.c_str());
+ remove(kOutputFilename.c_str());
}
FrameWriter* frame_writer_;
};
diff --git a/webrtc/test/testsupport/metrics/video_metrics.cc b/webrtc/test/testsupport/metrics/video_metrics.cc
index e9cf57c..f537e03 100644
--- a/webrtc/test/testsupport/metrics/video_metrics.cc
+++ b/webrtc/test/testsupport/metrics/video_metrics.cc
@@ -10,9 +10,10 @@
#include "webrtc/test/testsupport/metrics/video_metrics.h"
+#include <assert.h>
+#include <stdio.h>
+
#include <algorithm> // min_element, max_element
-#include <cassert>
-#include <cstdio>
#include "webrtc/common_video/interface/i420_video_frame.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
diff --git a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
index c825f9e..2803322 100644
--- a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
+++ b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
@@ -39,7 +39,7 @@
fclose(dummy);
}
void TearDown() {
- std::remove(kEmptyFileName);
+ remove(kEmptyFileName);
}
webrtc::test::QualityMetricsResult psnr_result_;
webrtc::test::QualityMetricsResult ssim_result_;
diff --git a/webrtc/test/testsupport/packet_reader.cc b/webrtc/test/testsupport/packet_reader.cc
index eaafc80..54552bd 100644
--- a/webrtc/test/testsupport/packet_reader.cc
+++ b/webrtc/test/testsupport/packet_reader.cc
@@ -10,8 +10,8 @@
#include "webrtc/test/testsupport/packet_reader.h"
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
namespace webrtc {
namespace test {
diff --git a/webrtc/test/testsupport/trace_to_stderr.cc b/webrtc/test/testsupport/trace_to_stderr.cc
index 39706c5..e378d97 100644
--- a/webrtc/test/testsupport/trace_to_stderr.cc
+++ b/webrtc/test/testsupport/trace_to_stderr.cc
@@ -10,8 +10,8 @@
#include "webrtc/test/testsupport/trace_to_stderr.h"
-#include <cassert>
-#include <cstdio>
+#include <assert.h>
+#include <stdio.h>
#include <string>
diff --git a/webrtc/tools/converter/converter.cc b/webrtc/tools/converter/converter.cc
index ca3ba9a..6c9154c 100644
--- a/webrtc/tools/converter/converter.cc
+++ b/webrtc/tools/converter/converter.cc
@@ -7,10 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
-#include <cstdio>
#include <iomanip>
#include <sstream>
diff --git a/webrtc/tools/converter/rgba_to_i420_converter.cc b/webrtc/tools/converter/rgba_to_i420_converter.cc
index 4e53f94..126a31c 100644
--- a/webrtc/tools/converter/rgba_to_i420_converter.cc
+++ b/webrtc/tools/converter/rgba_to_i420_converter.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <map>
#include <string>
#include <vector>
diff --git a/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc b/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc
index c824f8a..11fb18a 100644
--- a/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc
+++ b/webrtc/tools/force_mic_volume_max/force_mic_volume_max.cc
@@ -10,7 +10,7 @@
// This utility will portably force the volume of the default microphone to max.
-#include <cstdio>
+#include <stdio.h>
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
diff --git a/webrtc/tools/frame_analyzer/frame_analyzer.cc b/webrtc/tools/frame_analyzer/frame_analyzer.cc
index 6b46cfd..d368379 100644
--- a/webrtc/tools/frame_analyzer/frame_analyzer.cc
+++ b/webrtc/tools/frame_analyzer/frame_analyzer.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <map>
#include <string>
#include <vector>
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.cc b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
index d685634..14f5ec6 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.cc
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
@@ -10,9 +10,10 @@
#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <string>
#define STATS_LINE_LENGTH 32
diff --git a/webrtc/tools/frame_editing/frame_editing_unittest.cc b/webrtc/tools/frame_editing/frame_editing_unittest.cc
index d333fd4..8330218 100644
--- a/webrtc/tools/frame_editing/frame_editing_unittest.cc
+++ b/webrtc/tools/frame_editing/frame_editing_unittest.cc
@@ -9,8 +9,8 @@
*/
#include <stdio.h>
+#include <stdlib.h>
-#include <cstdlib>
#include <fstream>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc b/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
index 8f63dae..1524610 100644
--- a/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
+++ b/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <map>
#include <string>
#include <vector>
diff --git a/webrtc/tools/simple_command_line_parser.cc b/webrtc/tools/simple_command_line_parser.cc
index d6a8c1b..62aba3d 100644
--- a/webrtc/tools/simple_command_line_parser.cc
+++ b/webrtc/tools/simple_command_line_parser.cc
@@ -10,8 +10,9 @@
#include "webrtc/tools/simple_command_line_parser.h"
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <string>
namespace webrtc {
diff --git a/webrtc/video_engine/call_stats.cc b/webrtc/video_engine/call_stats.cc
index 233d536..0184e5b 100644
--- a/webrtc/video_engine/call_stats.cc
+++ b/webrtc/video_engine/call_stats.cc
@@ -10,7 +10,7 @@
#include "webrtc/video_engine/call_stats.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/video_engine/internal/video_call.cc b/webrtc/video_engine/internal/video_call.cc
index da014f4..99112bf 100644
--- a/webrtc/video_engine/internal/video_call.cc
+++ b/webrtc/video_engine/internal/video_call.cc
@@ -10,8 +10,9 @@
#include "webrtc/video_engine/internal/video_call.h"
-#include <cassert>
-#include <cstring>
+#include <assert.h>
+#include <string.h>
+
#include <map>
#include <vector>
diff --git a/webrtc/video_engine/internal/video_engine.cc b/webrtc/video_engine/internal/video_engine.cc
index 10dd3fa..ec1d2f4 100644
--- a/webrtc/video_engine/internal/video_engine.cc
+++ b/webrtc/video_engine/internal/video_engine.cc
@@ -10,7 +10,7 @@
#include "webrtc/video_engine/new_include/video_engine.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/video_engine/internal/video_call.h"
diff --git a/webrtc/video_engine/internal/video_receive_stream.cc b/webrtc/video_engine/internal/video_receive_stream.cc
index c6722d2..50f4553 100644
--- a/webrtc/video_engine/internal/video_receive_stream.cc
+++ b/webrtc/video_engine/internal/video_receive_stream.cc
@@ -10,8 +10,8 @@
#include "webrtc/video_engine/internal/video_receive_stream.h"
-#include <cassert>
-#include <cstdlib>
+#include <assert.h>
+#include <stdlib.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/system_wrappers/interface/clock.h"
diff --git a/webrtc/video_engine/stream_synchronization.cc b/webrtc/video_engine/stream_synchronization.cc
index 9490d10..fcff782 100644
--- a/webrtc/video_engine/stream_synchronization.cc
+++ b/webrtc/video_engine/stream_synchronization.cc
@@ -10,9 +10,10 @@
#include "webrtc/video_engine/stream_synchronization.h"
-#include <algorithm>
#include <assert.h>
-#include <cmath>
+#include <math.h>
+
+#include <algorithm>
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
index f799e21..ab78c1e 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <ctime>
+#include <time.h>
#include "gflags/gflags.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -65,7 +65,7 @@
if (FLAGS_rtp_fuzz_test_rand_seed != 0) {
return FLAGS_rtp_fuzz_test_rand_seed;
}
- return std::time(NULL);
+ return time(NULL);
}
// Pass in a number [0, 1] which will be the bit flip probability per byte.
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
index 0990fa2..74aa096 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
@@ -13,7 +13,7 @@
// tests in this section of the code. Currently, this code makes no attempt
// to verify any video output - it only checks for direct errors.
-#include <cstdio>
+#include <stdio.h>
#include "gflags/gflags.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
index 9b0cb16..83476e0 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
@@ -16,9 +16,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_DEFINES_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_DEFINES_H_
-#include <cassert>
+#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
+
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
index 9836d0c..8cc686a 100644
--- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
@@ -10,10 +10,11 @@
#include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <algorithm>
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
#include <sstream>
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
index b26e2f4..469a375 100644
--- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
+#include <stdio.h>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h"
diff --git a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
index 1973736..c298fe2 100644
--- a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
+++ b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
@@ -10,7 +10,8 @@
#ifndef FAKE_STDIN_H_
#define FAKE_STDIN_H_
-#include <cstdio>
+#include <stdio.h>
+
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
index f62732b..e49be53 100644
--- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
-#include <cmath>
+#include <assert.h>
+#include <math.h>
+
#include <sstream>
#include <string>
@@ -294,8 +295,8 @@
delete[] last_frame_data;
frame_reader.Close();
frame_writer.Close();
- ASSERT_EQ(0, std::remove(output_file.c_str()));
- ASSERT_EQ(0, std::rename(temp_file.c_str(), output_file.c_str()));
+ ASSERT_EQ(0, remove(output_file.c_str()));
+ ASSERT_EQ(0, rename(temp_file.c_str(), output_file.c_str()));
}
void FrameDropDetector::ReportFrameState(State state, unsigned int timestamp,
diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
index 5edd4a3..c1501e5 100644
--- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
@@ -10,7 +10,8 @@
#include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"
-#include <cstdio>
+#include <stdio.h>
+
#include <vector>
#include "testing/gtest/include/gtest/gtest.h"
@@ -29,11 +30,11 @@
virtual ~FrameDropPrimitivesTest() {}
void SetUp() {
// Cleanup any previous output file.
- std::remove(kOutputFilename.c_str());
+ remove(kOutputFilename.c_str());
}
void TearDown() {
// Cleanup the temporary file.
- std::remove(kOutputFilename.c_str());
+ remove(kOutputFilename.c_str());
}
};
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
index ac63040..b5c4ae2 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
@@ -10,9 +10,9 @@
#include "webrtc/video_engine/test/auto_test/primitives/input_helpers.h"
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <algorithm>
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
index 1e857d4..536e708 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_
#define WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_
-#include <cstdlib>
+#include <stdlib.h>
#include <map>
#include <string>
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
index b9c679d..cbccf6f 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <climits>
-#include <cstdarg>
-#include <cstdio>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
#include <algorithm>
diff --git a/webrtc/video_engine/test/common/frame_generator.cc b/webrtc/video_engine/test/common/frame_generator.cc
index 359bbf7..b60e9d2 100644
--- a/webrtc/video_engine/test/common/frame_generator.cc
+++ b/webrtc/video_engine/test/common/frame_generator.cc
@@ -10,8 +10,8 @@
#include "webrtc/video_engine/test/common/frame_generator.h"
-#include <cmath>
-#include <cstring>
+#include <math.h>
+#include <string.h>
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/video_engine/new_include/video_send_stream.h"
diff --git a/webrtc/video_engine/test/common/gl/gl_renderer.cc b/webrtc/video_engine/test/common/gl/gl_renderer.cc
index 3345fac..5e229eb 100644
--- a/webrtc/video_engine/test/common/gl/gl_renderer.cc
+++ b/webrtc/video_engine/test/common/gl/gl_renderer.cc
@@ -10,7 +10,7 @@
#include "webrtc/video_engine/test/common/gl/gl_renderer.h"
-#include <cstring>
+#include <string.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
diff --git a/webrtc/video_engine/test/common/linux/glx_renderer.cc b/webrtc/video_engine/test/common/linux/glx_renderer.cc
index 931f94e..312cb11 100644
--- a/webrtc/video_engine/test/common/linux/glx_renderer.cc
+++ b/webrtc/video_engine/test/common/linux/glx_renderer.cc
@@ -10,11 +10,11 @@
#include "webrtc/video_engine/test/common/linux/glx_renderer.h"
+#include <assert.h>
+
#include <X11/Xatom.h>
#include <X11/Xlib.h>
-#include <cassert>
-
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc b/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
index 18d3026..b86ff09 100644
--- a/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
+++ b/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
@@ -55,7 +55,7 @@
webrtc::CriticalSectionScoped cs(mutex_);
assert(input_file_ == NULL);
- input_file_ = std::fopen(path.c_str(), "rb");
+ input_file_ = fopen(path.c_str(), "rb");
if (input_file_ == NULL) {
return false;
}
@@ -80,10 +80,10 @@
while (elapsed_ms < time_slice_ms) {
FramePacemaker pacemaker(max_fps);
- int read = std::fread(frame_buffer, 1, frame_length_, input_file_);
+ int read = fread(frame_buffer, 1, frame_length_, input_file_);
- if (std::feof(input_file_)) {
- std::rewind(input_file_);
+ if (feof(input_file_)) {
+ rewind(input_file_);
}
input_sink_->IncomingFrame(frame_buffer, read, width_, height_,
webrtc::kVideoI420,
@@ -101,5 +101,5 @@
webrtc::CriticalSectionScoped cs(mutex_);
assert(input_file_ != NULL);
- std::fclose(input_file_);
+ fclose(input_file_);
}
diff --git a/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc b/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc
index f2b334e..a70d6c9 100644
--- a/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc
+++ b/webrtc/video_engine/test/libvietest/helpers/vie_to_file_renderer.cc
@@ -66,7 +66,7 @@
assert(output_file_ == NULL);
- output_file_ = std::fopen((output_path + output_filename).c_str(), "wb");
+ output_file_ = fopen((output_path + output_filename).c_str(), "wb");
if (output_file_ == NULL) {
return false;
}
@@ -86,15 +86,15 @@
// Call Stop() repeatedly, waiting for ProcessRenderQueue() to finish.
while (!thread_->Stop()) continue;
}
- std::fclose(output_file_);
+ fclose(output_file_);
output_file_ = NULL;
}
bool ViEToFileRenderer::SaveOutputFile(const std::string& prefix) {
assert(output_file_ == NULL && output_filename_ != "");
- if (std::rename((output_path_ + output_filename_).c_str(),
+ if (rename((output_path_ + output_filename_).c_str(),
(output_path_ + prefix + output_filename_).c_str()) != 0) {
- std::perror("Failed to rename output file");
+ perror("Failed to rename output file");
return false;
}
ForgetOutputFile();
@@ -103,8 +103,8 @@
bool ViEToFileRenderer::DeleteOutputFile() {
assert(output_file_ == NULL && output_filename_ != "");
- if (std::remove((output_path_ + output_filename_).c_str()) != 0) {
- std::perror("Failed to delete output file");
+ if (remove((output_path_ + output_filename_).c_str()) != 0) {
+ perror("Failed to delete output file");
return false;
}
ForgetOutputFile();
@@ -170,7 +170,7 @@
// the renderer.
frame_queue_cs_->Leave();
assert(output_file_);
- int written = std::fwrite(frame->buffer.get(), sizeof(unsigned char),
+ int written = fwrite(frame->buffer.get(), sizeof(unsigned char),
frame->buffer_size, output_file_);
frame_queue_cs_->Enter();
// Return the frame.
diff --git a/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h b/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
index 86534ab..2abd88c 100644
--- a/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
+++ b/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
@@ -11,7 +11,7 @@
#ifndef SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_HELPERS_VIE_FILE_CAPTURE_DEVICE_H_
#define SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_HELPERS_VIE_FILE_CAPTURE_DEVICE_H_
-#include <cstdio>
+#include <stdio.h>
#include <string>
@@ -46,7 +46,7 @@
private:
webrtc::ViEExternalCapture* input_sink_;
- std::FILE* input_file_;
+ FILE* input_file_;
webrtc::CriticalSectionWrapper* mutex_;
uint32_t frame_length_;
diff --git a/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h b/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
index 6b04d22..32ee1c1 100644
--- a/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
+++ b/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
@@ -11,8 +11,9 @@
#ifndef WEBRTC_VIDEO_ENGINE_TEST_LIBVIETEST_INCLUDE_VIE_TO_FILE_RENDERER_H_
#define WEBRTC_VIDEO_ENGINE_TEST_LIBVIETEST_INCLUDE_VIE_TO_FILE_RENDERER_H_
-#include <cstdio>
-#include <cstring>
+#include <stdio.h>
+#include <string.h>
+
#include <list>
#include <string>
@@ -70,7 +71,7 @@
void ForgetOutputFile();
bool ProcessRenderQueue();
- std::FILE* output_file_;
+ FILE* output_file_;
std::string output_path_;
std::string output_filename_;
webrtc::scoped_ptr<webrtc::ThreadWrapper> thread_;
diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc b/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
index 5bdf81c..f26c1e1 100644
--- a/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
@@ -10,7 +10,8 @@
#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
-#include <cassert>
+#include <assert.h>
+
#include <math.h>
#include <stdio.h> // printf
#include <stdlib.h> // rand
@@ -19,7 +20,7 @@
#include <string.h>
#endif
#if defined(WEBRTC_MAC)
-#include <cstring>
+#include <string.h>
#endif
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/video_engine/test/loopback.cc b/webrtc/video_engine/test/loopback.cc
index b298b1a..5dae857 100644
--- a/webrtc/video_engine/test/loopback.cc
+++ b/webrtc/video_engine/test/loopback.cc
@@ -8,7 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
+#include <stdio.h>
+
#include <map>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index 206a718..af82de3 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -10,8 +10,9 @@
#include "webrtc/video_engine/vie_encoder.h"
+#include <assert.h>
+
#include <algorithm>
-#include <cassert>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/pacing/include/paced_sender.h"
diff --git a/webrtc/video_engine/vie_input_manager.cc b/webrtc/video_engine/vie_input_manager.cc
index 7647811..b1f28ae 100644
--- a/webrtc/video_engine/vie_input_manager.cc
+++ b/webrtc/video_engine/vie_input_manager.cc
@@ -10,7 +10,7 @@
#include "webrtc/video_engine/vie_input_manager.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/common_types.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h"
diff --git a/webrtc/video_engine/vie_remb.cc b/webrtc/video_engine/vie_remb.cc
index 4b6f234..578c0b4 100644
--- a/webrtc/video_engine/vie_remb.cc
+++ b/webrtc/video_engine/vie_remb.cc
@@ -10,8 +10,9 @@
#include "webrtc/video_engine/vie_remb.h"
+#include <assert.h>
+
#include <algorithm>
-#include <cassert>
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
#include "webrtc/modules/utility/interface/process_thread.h"
diff --git a/webrtc/video_engine/vie_sender.cc b/webrtc/video_engine/vie_sender.cc
index f28e865..b90d56f 100644
--- a/webrtc/video_engine/vie_sender.cc
+++ b/webrtc/video_engine/vie_sender.cc
@@ -10,7 +10,7 @@
#include "webrtc/video_engine/vie_sender.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/modules/utility/interface/rtp_dump.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/webrtc/voice_engine/channel_manager_base.cc b/webrtc/voice_engine/channel_manager_base.cc
index 440a0ea..10cb11f 100644
--- a/webrtc/voice_engine/channel_manager_base.cc
+++ b/webrtc/voice_engine/channel_manager_base.cc
@@ -10,7 +10,8 @@
#include "webrtc/voice_engine/channel_manager_base.h"
-#include <cassert>
+#include <assert.h>
+
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
diff --git a/webrtc/voice_engine/dtmf_inband.cc b/webrtc/voice_engine/dtmf_inband.cc
index ee9eb9f..7ae24db 100644
--- a/webrtc/voice_engine/dtmf_inband.cc
+++ b/webrtc/voice_engine/dtmf_inband.cc
@@ -10,7 +10,8 @@
#include "webrtc/voice_engine/dtmf_inband.h"
-#include <cassert>
+#include <assert.h>
+
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/webrtc/voice_engine/statistics.cc b/webrtc/voice_engine/statistics.cc
index a1faae7..4717fd1 100644
--- a/webrtc/voice_engine/statistics.cc
+++ b/webrtc/voice_engine/statistics.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cassert>
+#include <assert.h>
#include <stdio.h>
#include "webrtc/voice_engine/statistics.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h b/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h
index 7e053fb..3e1345a 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h
+++ b/webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h
@@ -10,7 +10,7 @@
#ifndef VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKE_MEDIA_PROCESS_H_
#define VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKE_MEDIA_PROCESS_H_
-#include <cmath>
+#include <math.h>
class FakeMediaProcess : public webrtc::VoEMediaProcess {
public:
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
index 677dea6..8cd4894 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
+++ b/webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc
@@ -10,7 +10,7 @@
#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
-#include <cstring>
+#include <string.h>
AfterStreamingFixture::AfterStreamingFixture()
: channel_(voe_base_->CreateChannel()) {
diff --git a/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc b/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc
index dab693f..bf68da1 100644
--- a/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc
+++ b/webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <ctime>
+#include <time.h>
#include "webrtc/test/libtest/include/bit_flip_encryption.h"
#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
@@ -16,7 +16,7 @@
class RtpFuzzTest : public AfterStreamingFixture {
protected:
void BitFlipFuzzTest(float flip_probability) {
- BitFlipEncryption bit_flip_encryption(std::time(NULL), flip_probability);
+ BitFlipEncryption bit_flip_encryption(time(NULL), flip_probability);
TEST_LOG("Starting to flip bits in RTP/RTCP packets.\n");
voe_encrypt_->RegisterExternalEncryption(channel_, bit_flip_encryption);
diff --git a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
index 95d4c33..2fd34e7 100644
--- a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstring>
+#include <string.h>
#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
diff --git a/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc b/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc
index 2bf9095..2d99fb0 100644
--- a/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc
@@ -8,7 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cmath>
+#include <math.h>
+
#include <numeric>
#include <vector>
@@ -66,7 +67,7 @@
for (; start != end; ++start) {
variance += (*start - mean) * (*start - mean) / (num_elements - 1);
}
- return std::sqrt(variance);
+ return sqrt(variance);
}
};
diff --git a/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc b/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc
index 5d11af3..8d8713c 100644
--- a/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc
@@ -10,7 +10,7 @@
#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h"
-#include <cstdlib>
+#include <stdlib.h>
class VoeBaseMiscTest : public BeforeInitializationFixture {
};
diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc
index 5a293fc..f4550fc 100644
--- a/webrtc/voice_engine/voe_hardware_impl.cc
+++ b/webrtc/voice_engine/voe_hardware_impl.cc
@@ -10,7 +10,7 @@
#include "webrtc/voice_engine/voe_hardware_impl.h"
-#include <cassert>
+#include <assert.h>
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"