Update talk to 60923971

Review URL: https://webrtc-codereview.appspot.com/7909004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5475 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-02-03 16:57:16 +00:00
parent 422fdbf502
commit 67ee6b9a62
51 changed files with 1442 additions and 292 deletions
--- a/talk/base/asyncsocket.h
+++ b/talk/base/asyncsocket.h
@@ -27,7 +27,6 @@

 #ifndef TALK_BASE_ASYNCSOCKET_H_
 #define TALK_BASE_ASYNCSOCKET_H_
-#ifndef __native_client__

 #include "talk/base/common.h"
 #include "talk/base/sigslot.h"
@@ -139,5 +138,4 @@ class AsyncSocketAdapter : public AsyncSocket, public sigslot::has_slots<> {

 }  // namespace talk_base

-#endif  //  __native_client__
 #endif  // TALK_BASE_ASYNCSOCKET_H_