commit 3f45c2e0ac4cb280f941efa3a3476895795e3dd6
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Aug 05 16:22:53 2013 +0000
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Aug 05 16:22:53 2013 +0000
tree b449e98158b17765606544974759a1f387b02eaf
parent 043f6a808f9ef95d573a222dfe5eb7f94f00f268

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/webrtc@4486 4adac7df-926f-26a2-2b94-8c16560cd09d

modules/audio_coding/neteq4/merge.cc

diff --git a/modules/audio_coding/neteq4/merge.cc b/modules/audio_coding/neteq4/merge.cc
index 5c081fe..c15fc34 100644
--- a/modules/audio_coding/neteq4/merge.cc
+++ b/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"