Bug 1264887: Make DBus helpers available on desktop builds, r=shuang
authorThomas Zimmermann <tdz@users.sourceforge.net>
Tue, 19 Apr 2016 16:26:01 +0200
changeset 331766 4a0e32f4856906445492002e444085f52803f25a
parent 331765 8c65edcc96d01f8f3864392d92faca52f1a30fd2
child 331767 e07c615c423b808aa018431dc8ed221e39506552
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshuang
bugs1264887
milestone48.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 1264887: Make DBus helpers available on desktop builds, r=shuang
ipc/dbus/DBusUtils.h
ipc/moz.build
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -28,17 +28,17 @@
 #define LOG_AND_FREE_DBUS_ERROR(err) log_and_free_dbus_error(err, __FUNCTION__);
 
 namespace mozilla {
 namespace ipc {
 
 class DBusMessageRefPtr
 {
 public:
-  DBusMessageRefPtr(DBusMessage* aMsg);
+  explicit DBusMessageRefPtr(DBusMessage* aMsg);
   ~DBusMessageRefPtr();
 
   operator DBusMessage* ()
   {
     return mMsg;
   }
 
   DBusMessage* get()
--- a/ipc/moz.build
+++ b/ipc/moz.build
@@ -9,17 +9,17 @@ DIRS += [
     'glue',
     'ipdl',
     'testshell',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
     DIRS += ['ril']
 
-if CONFIG['MOZ_B2G_BT_BLUEZ']:
+if CONFIG['MOZ_ENABLE_DBUS'] or CONFIG['MOZ_B2G_BT_BLUEZ']:
     DIRS += ['dbus']
 
 if CONFIG['MOZ_NFC']:
     DIRS += ['nfc']
 
 if CONFIG['MOZ_B2G_RIL'] or CONFIG['MOZ_B2G_BT'] or CONFIG['MOZ_NFC'] or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DIRS += ['unixfd', 'unixsocket']