diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 18:35:08 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 18:35:08 +0000 |
| commit | 836c8975362beb3670717db33e98963c5d2c833e (patch) | |
| tree | 079bdc30b2a87d5fc6e1353053b97e3dc504f588 /jingle | |
| parent | 3c21d74b8d7bbe740b21413a378cf83db0abff41 (diff) | |
| download | chromium_src-836c8975362beb3670717db33e98963c5d2c833e.zip chromium_src-836c8975362beb3670717db33e98963c5d2c833e.tar.gz chromium_src-836c8975362beb3670717db33e98963c5d2c833e.tar.bz2 | |
* Remove the dependency to ws2_32.dll from talk_base::ThreadManager and talk_base::Thread.
* Remove the denendency to the htons(), htonl(), ntohs(), ntohl().
* Implement inet_pton_v4 without using ws2.
* Update the remoting_unittests.
BUG=115501
TEST=Build and run webrtc test on Windows.
Review URL: http://codereview.chromium.org/9455070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/thread_wrapper.cc | 3 | ||||
| -rw-r--r-- | jingle/glue/thread_wrapper.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc index 456a619..62538da 100644 --- a/jingle/glue/thread_wrapper.cc +++ b/jingle/glue/thread_wrapper.cc @@ -43,7 +43,8 @@ JingleThreadWrapper* JingleThreadWrapper::current() { } JingleThreadWrapper::JingleThreadWrapper(MessageLoop* message_loop) - : message_loop_(message_loop), + : talk_base::Thread(NULL), + message_loop_(message_loop), send_allowed_(false), last_task_id_(0), pending_send_event_(true, false) { diff --git a/jingle/glue/thread_wrapper.h b/jingle/glue/thread_wrapper.h index 284c762..553dbbd 100644 --- a/jingle/glue/thread_wrapper.h +++ b/jingle/glue/thread_wrapper.h @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "third_party/libjingle/source/talk/base/thread.h" +#include "third_party/libjingle/overrides/talk/base/thread.h" namespace jingle_glue { |