| commit | aebb1ade9d760841f243e380fa22b7ecff2d3ecc | [log] [tgz] |
|---|---|---|
| author | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Tue Jan 14 10:00:58 2014 +0000 |
| committer | henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Tue Jan 14 10:00:58 2014 +0000 |
| tree | f71bb0034f2ab344bea85988014ec96cb86807bb | |
| parent | 4371d4650ab2c1bbfa3b97133100ddf33312a199 [diff] [blame] |
pRevert 5371 "Revert 5367 "Update talk to 59410372."" > Revert 5367 "Update talk to 59410372." > > > Update talk to 59410372. > > > > R=jiayl@webrtc.org, wu@webrtc.org > > > > Review URL: https://webrtc-codereview.appspot.com/6929004 > > TBR=mallinath@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/6999004 TBR=henrika@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7109004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5381 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/base/socket.h b/talk/base/socket.h index e738060..56e3ebc 100644 --- a/talk/base/socket.h +++ b/talk/base/socket.h
@@ -28,6 +28,14 @@ #ifndef TALK_BASE_SOCKET_H__ #define TALK_BASE_SOCKET_H__ +#if defined(__native_client__) +namespace talk_base { +// These should never be defined or instantiated. +class Socket; +class AsyncSocket; +} // namespace talk_base +#else + #include <errno.h> #ifdef POSIX @@ -199,4 +207,5 @@ } // namespace talk_base +#endif // !__native_client__ #endif // TALK_BASE_SOCKET_H__