diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 21:33:00 +0000 |
| commit | 6040af94afce8f5953b8c19c5258a6d8be122152 (patch) | |
| tree | 4b5ac1a229555694d24103633386b192d8132594 /third_party/libjingle/overrides | |
| parent | ea91a2bf8536adfed57c70d56df741dbd8aeb8d2 (diff) | |
| download | chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.zip chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.gz chromium_src-6040af94afce8f5953b8c19c5258a6d8be122152.tar.bz2 | |
Makes the necessary changes to sync.gyp as well as its dependencies (most notably jingle) in order to bring up the complete sync_notifier target on iOS.
TBR=thakis
Review URL: https://chromiumcodereview.appspot.com/12041016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle/overrides')
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/logging.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/libjingle/overrides/talk/base/logging.cc b/third_party/libjingle/overrides/talk/base/logging.cc index 72e24e3..d9c0702 100644 --- a/third_party/libjingle/overrides/talk/base/logging.cc +++ b/third_party/libjingle/overrides/talk/base/logging.cc @@ -4,7 +4,7 @@ #include "third_party/libjingle/overrides/talk/base/logging.h" -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) && !defined(OS_IOS) #include <CoreServices/CoreServices.h> #endif // OS_MACOSX @@ -86,7 +86,11 @@ static std::string GenerateExtra(LogErrorContext err_ctx, break; } #endif // OS_WIN -#if defined(OS_MACOSX) +#if defined(OS_IOS) + case ERRCTX_OSSTATUS: + tmp << " " << "Unknown LibJingle error: " << err; + break; +#elif defined(OS_MACOSX) case ERRCTX_OSSTATUS: { tmp << " " << nonnull(GetMacOSStatusErrorString(err), "Unknown error"); if (const char* desc = GetMacOSStatusCommentString(err)) { |