Bug 785486 - DomCameraManager redefines DOM_CAMERA_LOG_LEVEL r=mikeh
authorDavid Zbarsky <dzbarsky@gmail.com>
Fri, 24 Aug 2012 16:50:57 -0400
changeset 103352 e89ead1bbe389ca1a0a1e6ce5a9662dbf3881f9c
parent 103351 f56f3d3f2c12b67624a84c2bbfdb38f7bff29fd7
child 103353 50430d101d34fbd28d5e02d20eac5d6878025287
push id23343
push userryanvm@gmail.com
push dateSat, 25 Aug 2012 02:53:35 +0000
treeherdermozilla-central@f077de66e52d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikeh
bugs785486
milestone17.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 785486 - DomCameraManager redefines DOM_CAMERA_LOG_LEVEL r=mikeh
dom/camera/DOMCameraManager.cpp
--- a/dom/camera/DOMCameraManager.cpp
+++ b/dom/camera/DOMCameraManager.cpp
@@ -2,16 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "CameraControl.h"
 #include "DOMCameraManager.h"
 #include "nsDOMClassInfo.h"
 #include "DictionaryHelpers.h"
 
+#undef DOM_CAMERA_LOG_LEVEL
 #define DOM_CAMERA_LOG_LEVEL  DOM_CAMERA_LOG_NOTHING
 #include "CameraCommon.h"
 
 using namespace mozilla;
 
 DOMCI_DATA(CameraManager, nsIDOMCameraManager)
 
 NS_INTERFACE_MAP_BEGIN(nsDOMCameraManager)