diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-08-17 16:35:43 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-17 16:35:43 +0100 |
| commit | 606135ebf06650c5f2be1d453ab6fe1b72aa9921 (patch) | |
| tree | ac23277ec0644ca2778de5ea35e9eacc62835694 | |
| parent | b760f1dadfd21c0cbe1e83203baad8d155685d8b (diff) | |
| download | external_chromium-606135ebf06650c5f2be1d453ab6fe1b72aa9921.zip external_chromium-606135ebf06650c5f2be1d453ab6fe1b72aa9921.tar.gz external_chromium-606135ebf06650c5f2be1d453ab6fe1b72aa9921.tar.bz2 | |
Only defining LOG_ASSERT if is not already defined in ANDROID.
This fixes a few compile problems and warnings.
Change-Id: I0c977b5e03565d1e8c55d108ad3d49e2061b497a
| -rw-r--r-- | base/logging.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/base/logging.h b/base/logging.h index 291c4a0..0152e8c 100644 --- a/base/logging.h +++ b/base/logging.h @@ -258,8 +258,16 @@ const LogSeverity LOG_DFATAL_LEVEL = LOG_FATAL; !(condition) ? (void) 0 : logging::LogMessageVoidify() & LOG(severity) #define SYSLOG_IF(severity, condition) LOG_IF(severity, condition) +#ifdef ANDROID +#ifndef LOG_ASSERT #define LOG_ASSERT(condition) \ LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". " +#endif // ifndef LOG_ASSERT +#else +#define LOG_ASSERT(condition) \ + LOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". " +#endif // ANDROID + #define SYSLOG_ASSERT(condition) \ SYSLOG_IF(FATAL, !(condition)) << "Assert failed: " #condition ". " |