From 08557c5100120611a914aad7ccb05444fc5eb7de Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@mozilla.com>
Date: Thu, 8 Jan 2015 13:52:19 -0800
Subject: [PATCH] Bug 1073003 - Fix warnings causing errors in emulator build.
 r=nfroyd

---
 dom/media/omx/OmxDecoder.cpp     | 1 +
 dom/svg/nsSVGBoolean.cpp         | 2 +-
 dom/system/gonk/AudioManager.cpp | 1 +
 ipc/chromium/src/base/logging.h  | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dom/media/omx/OmxDecoder.cpp b/dom/media/omx/OmxDecoder.cpp
index 9a6e6d9175c2..c84c2f70b078 100644
--- a/dom/media/omx/OmxDecoder.cpp
+++ b/dom/media/omx/OmxDecoder.cpp
@@ -36,6 +36,7 @@
 #include <android/log.h>
 #define OD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "OmxDecoder", __VA_ARGS__)
 
+#undef LOG
 #ifdef PR_LOGGING
 PRLogModuleInfo *gOmxDecoderLog;
 #define LOG(type, msg...) PR_LOG(gOmxDecoderLog, type, (msg))
diff --git a/dom/svg/nsSVGBoolean.cpp b/dom/svg/nsSVGBoolean.cpp
index bd89d4266e0d..1909433ea1db 100644
--- a/dom/svg/nsSVGBoolean.cpp
+++ b/dom/svg/nsSVGBoolean.cpp
@@ -56,7 +56,7 @@ GetValueFromAtom(const nsIAtom* aValueAsAtom, bool *aValue)
 nsresult
 nsSVGBoolean::SetBaseValueAtom(const nsIAtom* aValue, nsSVGElement *aSVGElement)
 {
-  bool val;
+  bool val = false;
 
   nsresult rv = GetValueFromAtom(aValue, &val);
   if (NS_FAILED(rv)) {
diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp
index 39469270d10b..5fe1e7a77f46 100644
--- a/dom/system/gonk/AudioManager.cpp
+++ b/dom/system/gonk/AudioManager.cpp
@@ -51,6 +51,7 @@ using namespace mozilla::hal;
 using namespace mozilla;
 using namespace mozilla::dom::bluetooth;
 
+#undef LOG
 #define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "AudioManager" , ## args)
 
 #define HEADPHONES_STATUS_HEADSET     MOZ_UTF16("headset")
diff --git a/ipc/chromium/src/base/logging.h b/ipc/chromium/src/base/logging.h
index c27bd435530f..e36dce93ee2d 100644
--- a/ipc/chromium/src/base/logging.h
+++ b/ipc/chromium/src/base/logging.h
@@ -108,6 +108,7 @@ const mozilla::EmptyLog& operator <<(const mozilla::EmptyLog& log, const T&)
 #define DCHECK(condition) while (false && (condition)) mozilla::EmptyLog()
 #endif
 
+#undef LOG_ASSERT
 #define LOG_ASSERT(cond) CHECK(0)
 #define DLOG_ASSERT(cond) DCHECK(0)