diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 14:05:47 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 14:05:47 +0000 |
| commit | a8381db264be4ee75551b97c76a6cd5a8284c18a (patch) | |
| tree | 19c0109001820010d003aa0bed7a677e721a7c10 /third_party | |
| parent | f2d3600970493d0291caee504e5ebb933596b6b1 (diff) | |
| download | chromium_src-a8381db264be4ee75551b97c76a6cd5a8284c18a.zip chromium_src-a8381db264be4ee75551b97c76a6cd5a8284c18a.tar.gz chromium_src-a8381db264be4ee75551b97c76a6cd5a8284c18a.tar.bz2 | |
Switch to new libjingle branch.
BUG=None
TEST=Compiles, Unittests
Review URL: http://codereview.chromium.org/6626010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 7 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/basictypes.h | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index fc855b5..18b235f9 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -155,7 +155,6 @@ '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', @@ -168,6 +167,8 @@ 'source/talk/base/base64.cc', 'source/talk/base/base64.h', 'source/talk/base/basicdefs.h', + 'source/talk/base/basicpacketsocketfactory.cc', + 'source/talk/base/basicpacketsocketfactory.h', 'source/talk/base/bytebuffer.cc', 'source/talk/base/bytebuffer.h', 'source/talk/base/byteorder.h', @@ -220,6 +221,8 @@ 'source/talk/base/proxydetect.h', 'source/talk/base/proxyinfo.cc', 'source/talk/base/proxyinfo.h', + 'source/talk/base/ratetracker.cc', + 'source/talk/base/ratetracker.h', 'source/talk/base/sec_buffer.h', 'source/talk/base/signalthread.cc', 'source/talk/base/signalthread.h', diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h index d6f90cf..4ea193e 100644 --- a/third_party/libjingle/overrides/talk/base/basictypes.h +++ b/third_party/libjingle/overrides/talk/base/basictypes.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -50,4 +50,14 @@ template<class T> inline T _max(T a, T b) { return (a < b) ? b : a; } const int kForever = -1; } +#ifdef WIN32 +#define alignof(t) __alignof(t) +#else // !WIN32 +#define alignof(t) __alignof__(t) +#endif // !WIN32 +#define IS_ALIGNED(p, a) (0==(reinterpret_cast<uintptr_t>(p) & ((a)-1))) +#define ALIGNP(p, t) \ + (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \ + ((t)-1)) & ~((t)-1)))) + #endif // OVERRIDES_TALK_BASE_BASICTYPES_H__ |