(Auto)update libjingle 68507189-> 68543735

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6329 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-04 16:23:10 +00:00
parent 40b45fc07a
commit 6f237769b3

View File

@ -69,10 +69,6 @@
#if !defined(LIBPEERCONNECTION_LIB)
#include "talk/media/webrtc/webrtcmediaengine.h"
#ifdef _MSC_VER
#define strtok_r strtok_s
#endif // _MSC_VER
WRME_EXPORT
cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
webrtc::AudioDeviceModule* adm, webrtc::AudioDeviceModule* adm_sc,
@ -149,9 +145,8 @@ static int GetExternalVideoPayloadType(int index) {
static void LogMultiline(talk_base::LoggingSeverity sev, char* text) {
const char* delim = "\r\n";
char* strtok_save;
for (char* tok = strtok_r(text, delim, &strtok_save);
tok; tok = strtok_r(NULL, delim, &strtok_save)) {
// TODO(fbarchard): Fix strtok lint warning.
for (char* tok = strtok(text, delim); tok; tok = strtok(NULL, delim)) {
LOG_V(sev) << tok;
}
}