Bug 1073003 - wError bustage fix in non-unified builds r=me a=bustage
authorWes Kocher <wkocher@mozilla.com>
Thu, 08 Jan 2015 15:46:15 -0800
changeset 248523 ccfafae7330f690dc9223b2b5b0ad2e6d5d90c4c
parent 248522 8bfe2f2408b70addfdf4696cba2bcb5e66eda2c7
child 248553 703f75b9a9c0045258d1e0bd8e96b5d2d41066db
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, bustage
bugs1073003
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1073003 - wError bustage fix in non-unified builds r=me a=bustage
dom/media/webrtc/MediaEngineGonkVideoSource.cpp
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
@@ -19,16 +19,17 @@
 #include "GonkCameraImage.h"
 
 namespace mozilla {
 
 using namespace mozilla::dom;
 using namespace mozilla::gfx;
 using namespace android;
 
+#undef LOG
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* GetMediaManagerLog();
 #define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
 #define LOGFRAME(msg) PR_LOG(GetMediaManagerLog(), 6, msg)
 #else
 #define LOG(msg)
 #define LOGFRAME(msg)
 #endif