Bug 975732 - Move one CXXFLAGS variable in dom/bluetooth to DEFINES; r=mshal
authorEhsan Akhgari <ehsan@mozilla.com>
Sat, 22 Feb 2014 21:42:12 -0500
changeset 170406 5c82f5085dd5cf2c4f476ab4bf537e82b4cea91a
parent 170405 b522f84cf8f843ce8428b0311e5b6720518bcdd9
child 170407 cbacdf83f1fb944f36eb50bd7c1c9da488a7739f
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmshal
bugs975732
milestone30.0a1
Bug 975732 - Move one CXXFLAGS variable in dom/bluetooth to DEFINES; r=mshal
dom/bluetooth/Makefile.in
dom/bluetooth/moz.build
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -17,12 +17,12 @@ ifneq (,$(MOZ_B2G_BT))
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 ifdef MOZ_B2G_BT_BLUEZ
 LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 endif #MOZ_B2G_BT_BLUEZ
 else
 ifdef MOZ_ENABLE_DBUS
 LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
-CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) -DHAVE_PTHREADS
+CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
 endif #MOZ_ENABLE_DBUS
 endif #MOZ_WIDGET_TOOLKIT
 endif #MOZ_B2G_BT
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -61,16 +61,17 @@ if CONFIG['MOZ_B2G_BT']:
             'bluez/BluetoothHfpManager.cpp',
             'bluez/linux/BluetoothDBusService.cpp',
         ]
         LOCAL_INCLUDES += [
             'bluez',
             'bluez/linux',
         ]
         DEFINES['MOZ_BLUETOOTH_DBUS'] = True
+        DEFINES['HAVE_PTHREADS'] = True
 
     FINAL_LIBRARY = 'gklayout'
 
     LOCAL_INCLUDES += [
         'ipc',
     ]
 
 EXPORTS.mozilla.dom.bluetooth.ipc += [