diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 22:37:18 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 22:37:18 +0000 |
| commit | 0a9d4553b6c5519914b7b9474c7ac455e62e6468 (patch) | |
| tree | f29c6cd7463e36ba34d6aa60be34bb1394d0e84b /third_party/libjingle | |
| parent | 8103c7fa6b614bf834b080962bdc28465ebe612b (diff) | |
| download | chromium_src-0a9d4553b6c5519914b7b9474c7ac455e62e6468.zip chromium_src-0a9d4553b6c5519914b7b9474c7ac455e62e6468.tar.gz chromium_src-0a9d4553b6c5519914b7b9474c7ac455e62e6468.tar.bz2 | |
libjingle roll 27->29
BUG=None
TEST=unittests
Review URL: http://codereview.chromium.org/3368008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 6 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/scoped_ptr.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index ff191b4..0c68ec6 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -152,11 +152,13 @@ 'source/talk/base/DiskCacheStd.h', 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', + 'source/talk/base/asyncfile.cc', 'source/talk/base/asyncfile.h', 'source/talk/base/asynchttprequest.cc', 'source/talk/base/asynchttprequest.h', 'source/talk/base/asyncpacketsocket.cc', 'source/talk/base/asyncpacketsocket.h', + 'source/talk/base/asyncsocket.cc', 'source/talk/base/asyncsocket.h', 'source/talk/base/asynctcpsocket.cc', 'source/talk/base/asynctcpsocket.h', @@ -234,10 +236,13 @@ 'source/talk/base/socketadapters.h', 'source/talk/base/socketaddress.cc', 'source/talk/base/socketaddress.h', + 'source/talk/base/socketaddresspair.cc', + 'source/talk/base/socketaddresspair.h', 'source/talk/base/socketfactory.h', 'source/talk/base/socketpool.cc', 'source/talk/base/socketpool.h', 'source/talk/base/socketserver.h', + 'source/talk/base/socketstream.cc', 'source/talk/base/socketstream.h', 'source/talk/base/ssladapter.cc', 'source/talk/base/ssladapter.h', @@ -377,6 +382,7 @@ 'source/talk/p2p/base/session.cc', 'source/talk/p2p/base/session.h', 'source/talk/p2p/base/sessionclient.h', + 'source/talk/p2p/base/sessiondescription.cc', 'source/talk/p2p/base/sessiondescription.h', 'source/talk/p2p/base/sessionid.h', 'source/talk/p2p/base/sessionmanager.cc', diff --git a/third_party/libjingle/overrides/talk/base/scoped_ptr.h b/third_party/libjingle/overrides/talk/base/scoped_ptr.h index bfe5f14..cc4fec9 100644 --- a/third_party/libjingle/overrides/talk/base/scoped_ptr.h +++ b/third_party/libjingle/overrides/talk/base/scoped_ptr.h @@ -5,10 +5,11 @@ // This file overrides the inclusion of talk/base/scoped_ptr.h. We use // a version of scoped_ptr from Chromium base, to avoid multiple definitions. -#ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H__ -#define OVERRIDES_TALK_BASE_SCOPED_PTR_H__ +#ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H_ +#define OVERRIDES_TALK_BASE_SCOPED_PTR_H_ #include "base/scoped_ptr.h" +#include "talk/base/common.h" namespace talk_base { @@ -17,4 +18,4 @@ using ::scoped_array; } // namespace talk_base -#endif // OVERRIDES_TALK_BASE_SCOPED_PTR_H__ +#endif // OVERRIDES_TALK_BASE_SCOPED_PTR_H_ |