Bug 712665 - Fix GonkHal.cpp debug compile errors. r=mwu
authorJustin Lebar <justin.lebar@gmail.com>
Wed, 21 Dec 2011 17:58:29 -0800
changeset 83232 65cf09e3fda375202d7db2bf7695f77f2f466ba1
parent 83231 fa06927b6435522be9cca4c4bccdff0605c78ea2
child 83233 ca4fa28622964fc3f8c200daab8109d4b8d0fc2f
push id4317
push usermwu@mozilla.com
push dateThu, 22 Dec 2011 01:59:12 +0000
treeherdermozilla-inbound@65cf09e3fda3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs712665
milestone12.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 712665 - Fix GonkHal.cpp debug compile errors. r=mwu
hal/Hal.h
hal/gonk/GonkHal.cpp
--- a/hal/Hal.h
+++ b/hal/Hal.h
@@ -66,17 +66,17 @@ class nsIDOMWindow;
 
 namespace mozilla {
 
 namespace hal {
 
 class WindowIdentifier;
 
 extern PRLogModuleInfo *sHalLog;
-#define HAL_LOG(msg) PR_LOG(sHalLog, PR_LOG_DEBUG, msg)
+#define HAL_LOG(msg) PR_LOG(mozilla::hal::sHalLog, PR_LOG_DEBUG, msg)
 
 } // namespace hal
 
 namespace MOZ_HAL_NAMESPACE {
 
 /**
  * Turn the default vibrator device on/off per the pattern specified
  * by |pattern|.  Each element in the pattern is the number of
--- a/hal/gonk/GonkHal.cpp
+++ b/hal/gonk/GonkHal.cpp
@@ -143,17 +143,17 @@ VibratorRunnable::Run()
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 VibratorRunnable::Observe(nsISupports *subject, const char *topic,
                           const PRUnichar *data)
 {
-  MOZ_ASSERT(strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0);
+  MOZ_ASSERT(strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0);
   MonitorAutoLock lock(mMonitor);
   mShuttingDown = true;
   mMonitor.Notify();
   return NS_OK;
 }
 
 void
 VibratorRunnable::Vibrate(const nsTArray<uint32> &pattern)