commit 6f237769b3d74b10a138184731c3fef2130bec0b
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jun 04 16:23:10 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jun 04 16:23:10 2014 +0000
tree dd44e367f8d4b0a24df77ac54dc36e6423575300
parent 40b45fc07a214c4102d83883bbd8bb7521de11e2

(Auto)update libjingle 68507189-> 68543735

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6329 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/media/webrtc/webrtcvideoengine.cc

diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index b2af319..a029ec2 100644
--- a/talk/media/webrtc/webrtcvideoengine.cc
+++ b/talk/media/webrtc/webrtcvideoengine.cc
@@ -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 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;
   }
 }