diff options
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/files/talk/base/logging.cc | 6 | ||||
| -rw-r--r-- | third_party/libjingle/files/talk/base/logging.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/third_party/libjingle/files/talk/base/logging.cc b/third_party/libjingle/files/talk/base/logging.cc index c76f205..941a32d 100644 --- a/third_party/libjingle/files/talk/base/logging.cc +++ b/third_party/libjingle/files/talk/base/logging.cc @@ -74,11 +74,11 @@ std::string ErrorName(int err, const talk_base::ConstantLabel * err_table) { // LogMessage ///////////////////////////////////////////////////////////////////////////// -#if _DEBUG +#if LOGGING static const int LOG_DEFAULT = LS_INFO; -#else // !_DEBUG +#else static const int LOG_DEFAULT = LogMessage::NO_LOGGING; -#endif // !_DEBUG +#endif // By default, release builds don't log, debug builds at info level int LogMessage::min_sev_ = LOG_DEFAULT; diff --git a/third_party/libjingle/files/talk/base/logging.h b/third_party/libjingle/files/talk/base/logging.h index 36d9d0c..189c8dd7 100644 --- a/third_party/libjingle/files/talk/base/logging.h +++ b/third_party/libjingle/files/talk/base/logging.h @@ -198,7 +198,7 @@ void LogMultiline(LoggingSeverity level, const char* label, bool input, // If LOGGING is not explicitly defined, default to enabled in debug mode #if defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS) #if !defined(LOGGING) -#if defined(_DEBUG) && !defined(NDEBUG) +#if !defined(NDEBUG) #define LOGGING 1 #else #define LOGGING 0 |