generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 68499439-> 68501302

Browse Source 
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
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
talk/media/webrtc/webrtcvideoengine.cc
View File

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