Bug 1073003 - Fix warnings causing errors in emulator build. r=nfroyd

This commit is contained in:
Dave Hylands 2015-01-08 13:52:19 -08:00
parent 44c0587ba5
commit 08557c5100
4 changed files with 4 additions and 1 deletions

View File

@ -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))

View File

@ -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)) {

View File

@ -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")

View File

@ -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)