Bug 753085: Desktop m-c does not compile with enable-b2g-ril on and enable-b2g-bt off; r=mwu
authorKyle Machulis <kyle@nonpolynomial.com>
Tue, 08 May 2012 13:47:19 -0700
changeset 95792 54fb7607331873d1ed1b83b03007c71f8eed74bf
parent 95791 9277703e34bddecba518de7d3a59a273cdca4d9c
child 95793 688c0eedab2849606c2f7883a663dbf5bcd78164
push id1439
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 20:19:22 +0000
treeherdermozilla-aurora@ea74834dccd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs753085
milestone15.0a1
Bug 753085: Desktop m-c does not compile with enable-b2g-ril on and enable-b2g-bt off; r=mwu
dom/system/gonk/SystemWorkerManager.cpp
--- a/dom/system/gonk/SystemWorkerManager.cpp
+++ b/dom/system/gonk/SystemWorkerManager.cpp
@@ -66,18 +66,20 @@
 #else
 #define BTDEBUG true
 #define LOG(args...) if(BTDEBUG) printf(args);
 #endif
 
 
 USING_WORKERS_NAMESPACE
 using namespace mozilla::dom::gonk;
+using namespace mozilla::ipc;
+#ifdef MOZ_B2G_BT
 using namespace mozilla::dom::bluetooth;
-using namespace mozilla::ipc;
+#endif
 
 namespace {
 
 NS_DEFINE_CID(kRadioInterfaceLayerCID, NS_RADIOINTERFACELAYER_CID);
 NS_DEFINE_CID(kWifiWorkerCID, NS_WIFIWORKER_CID);
 
 // Doesn't carry a reference, we're owned by services.
 SystemWorkerManager *gInstance = nsnull;
@@ -390,19 +392,17 @@ SystemWorkerManager::InitBluetooth(JSCon
 #ifdef MOZ_B2G_BT
 #ifdef MOZ_WIDGET_GONK
   // We need a platform specific check here to make sure of when we're
   // running on an emulator. Therefore, if we're compiled with gonk,
   // see if we can load functions out of bluedroid. If not, assume
   // it's an emulator and don't start the bluetooth thread.
   if(EnsureBluetoothInit()) {
 #endif
-#endif
     StartDBus();
-#ifdef MOZ_B2G_BT
 #ifdef MOZ_WIDGET_GONK
   }
   else {
     LOG("Bluedroid functions not available, assuming running on simulator. Not starting DBus thread.");
   }
 #endif
 #endif
   return NS_OK;