diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 18:18:33 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 18:18:33 +0000 |
| commit | 36d4ad5008ee38a8ab0ddad065e4ec46ffff5d0a (patch) | |
| tree | bf59fd4fde5f3052ff09588a42bc734bd0b89090 /chrome/browser/sync/notifier/base | |
| parent | c6e01dc7a346439ae64a00f9acd204025e17a218 (diff) | |
| download | chromium_src-36d4ad5008ee38a8ab0ddad065e4ec46ffff5d0a.zip chromium_src-36d4ad5008ee38a8ab0ddad065e4ec46ffff5d0a.tar.gz chromium_src-36d4ad5008ee38a8ab0ddad065e4ec46ffff5d0a.tar.bz2 | |
Fix compiling of sync on linux.
Review URL: http://codereview.chromium.org/211019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/notifier/base')
| -rw-r--r-- | chrome/browser/sync/notifier/base/string.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/notifier/base/task_pump.cc | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/sync/notifier/base/string.cc b/chrome/browser/sync/notifier/base/string.cc index 4c441f8..49ede9d 100644 --- a/chrome/browser/sync/notifier/base/string.cc +++ b/chrome/browser/sync/notifier/base/string.cc @@ -16,7 +16,9 @@ #include "talk/base/logging.h" #include "talk/base/stringencode.h" +#ifdef OS_WIN using base::snprintf; +#endif namespace notifier { @@ -278,7 +280,11 @@ std::string DoubleToString(double d) { std::string UIntToString(uint32 i) { char buf[80]; +#ifdef OS_LINUX + snprintf(buf, sizeof(buf), "%u", i); +#else snprintf(buf, sizeof(buf), "%lu", i); +#endif return std::string(buf); } diff --git a/chrome/browser/sync/notifier/base/task_pump.cc b/chrome/browser/sync/notifier/base/task_pump.cc index 0053d7a..f220063 100644 --- a/chrome/browser/sync/notifier/base/task_pump.cc +++ b/chrome/browser/sync/notifier/base/task_pump.cc @@ -17,7 +17,6 @@ TaskPump::TaskPump() : timeout_change_count_(0), posted_(false) { void TaskPump::OnMessage(talk_base::Message* msg) { posted_ = false; - int initial_count = timeout_change_count_; // If a task timed out, ensure that it is not blocked, so it will be deleted. // This may result in a WakeTasks if a task is timed out. |