From 45a1983cc104c81d0b592d5333b0524dc8764c9b Mon Sep 17 00:00:00 2001 From: "Nils Ohlmeier [:drno]" Date: Thu, 6 Apr 2017 11:00:35 -0700 Subject: [PATCH] Bug 1354222: fix log level casting warnings. r=erahm MozReview-Commit-ID: A6hnPD3NkYr --HG-- extra : rebase_source : a59a3d5acfdc219dd3f21b6acf1179125c766f5b --- media/mtransport/logging.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/media/mtransport/logging.h b/media/mtransport/logging.h index c2e7552f5bf3..49a64c69355c 100644 --- a/media/mtransport/logging.h +++ b/media/mtransport/logging.h @@ -12,13 +12,14 @@ #include #include "mozilla/Logging.h" +#ifdef MOZILLA_INTERNAL_API + #define ML_ERROR mozilla::LogLevel::Error #define ML_WARNING mozilla::LogLevel::Warning #define ML_NOTICE mozilla::LogLevel::Info #define ML_INFO mozilla::LogLevel::Debug #define ML_DEBUG mozilla::LogLevel::Verbose -#ifdef MOZILLA_INTERNAL_API #define MOZ_MTLOG_MODULE(n) \ static mozilla::LogModule* getLogModule() { \ static mozilla::LazyLogModule log(n); \ @@ -39,6 +40,12 @@ #include "prlog.h" +#define ML_ERROR PR_LOG_ERROR +#define ML_WARNING PR_LOG_WARNING +#define ML_NOTICE PR_LOG_INFO +#define ML_INFO PR_LOG_DEBUG +#define ML_DEBUG PR_LOG_VERBOSE + #define MOZ_MTLOG_MODULE(n) \ static PRLogModuleInfo* getLogModule() { \ static PRLogModuleInfo* log; \ @@ -49,10 +56,10 @@ #define MOZ_MTLOG(level, b) \ do { \ - if (PR_LOG_TEST(getLogModule(), (PRLogModuleLevel)level)) { \ + if (PR_LOG_TEST(getLogModule(), level)) { \ std::stringstream str; \ str << b; \ - PR_LOG(getLogModule(), (PRLogModuleLevel)level, ("%s", str.str().c_str())); \ + PR_LOG(getLogModule(), level, ("%s", str.str().c_str())); \ } \ } while(0) #endif // MOZILLA_INTERNAL_API