diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 21:35:44 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 21:35:44 +0000 |
| commit | 380d832903da7ecd90f22bc93e128e52366575d7 (patch) | |
| tree | a70683637eb82a57daefc701fe5a1b076a518e9c /base/debug | |
| parent | 3aa8b49dc9d29a5528753962c0760e34f8d63832 (diff) | |
| download | chromium_src-380d832903da7ecd90f22bc93e128e52366575d7.zip chromium_src-380d832903da7ecd90f22bc93e128e52366575d7.tar.gz chromium_src-380d832903da7ecd90f22bc93e128e52366575d7.tar.bz2 | |
Make base::Logging compile with the NaCl toolchain.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9474034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
| -rw-r--r-- | base/debug/debugger_posix.cc | 4 | ||||
| -rw-r--r-- | base/debug/trace_event_impl.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/base/debug/debugger_posix.cc b/base/debug/debugger_posix.cc index f16cd6d..4ce3f0f 100644 --- a/base/debug/debugger_posix.cc +++ b/base/debug/debugger_posix.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -17,7 +17,7 @@ #include <string> #include <vector> -#if !defined(OS_ANDROID) +#if !defined(OS_ANDROID) && !defined(OS_NACL) #include <execinfo.h> #endif diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc index fbe315e..bd997cf 100644 --- a/base/debug/trace_event_impl.cc +++ b/base/debug/trace_event_impl.cc @@ -335,7 +335,11 @@ TraceLog::TraceLog() ANNOTATE_BENIGN_RACE(&g_category_enabled[i], "trace_event category enabled"); } +#if defined(OS_NACL) // NaCl shouldn't expose the process id. + SetProcessID(0); +#else SetProcessID(static_cast<int>(base::GetCurrentProcId())); +#endif } TraceLog::~TraceLog() { |