Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6314)

Unified Diff: base/logging.cc

Issue 9474034: Make base::Logging compile with the NaCl toolchain. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/debug/trace_event_impl.cc ('k') | base/rand_util_nacl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/logging.cc
===================================================================
--- base/logging.cc (revision 123703)
+++ base/logging.cc (working copy)
@@ -347,9 +347,10 @@
LogLockingState lock_log,
OldFileDeletionState delete_old,
DcheckState dcheck_state) {
+ g_dcheck_state = dcheck_state;
+// TODO(bbudge) Hook this up to NaCl logging.
+#if !defined(OS_NACL)
CommandLine* command_line = CommandLine::ForCurrentProcess();
- g_dcheck_state = dcheck_state;
-
// Don't bother initializing g_vlog_info unless we use one of the
// vlog switches.
if (command_line->HasSwitch(switches::kV) ||
@@ -391,6 +392,9 @@
DeleteFilePath(*log_file_name);
return InitializeLogFileHandle();
+#else
+ return true;
+#endif // !defined(OS_NACL)
}
void SetMinLogLevel(int level) {
@@ -552,7 +556,7 @@
LogMessage::~LogMessage() {
// TODO(port): enable stacktrace generation on LOG_FATAL once backtrace are
// working in Android.
-#if !defined(NDEBUG) && !defined(OS_ANDROID)
+#if !defined(NDEBUG) && !defined(OS_ANDROID) && !defined(OS_NACL)
if (severity_ == LOG_FATAL) {
// Include a stack trace on a fatal.
base::debug::StackTrace trace;
« no previous file with comments | « base/debug/trace_event_impl.cc ('k') | base/rand_util_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698