(Auto)update libjingle 68499439-> 68501302

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6320 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-06-04 00:08:54 +00:00
parent 251fdf64cb
commit af81b9bffd

View File

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