(Auto)update libjingle 68501302-> 68506654
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6321 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc
index d137986..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 _WIN32
-#define strtok_r strtok_s
-#endif // _WIN32
-
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;
}
}