From dea85f2037229c781175e09a8b4e7eda90b2a58d Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Sat, 22 Feb 2014 21:42:12 -0500 Subject: [PATCH] Bug 975732 - Move one CXXFLAGS variable in dom/bluetooth to DEFINES; r=mshal --- dom/bluetooth/Makefile.in | 2 +- dom/bluetooth/moz.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index cd511f88cc03..673e8fb5279b 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -22,7 +22,7 @@ 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 diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 1a614d053f9c..ddd3f0f99cee 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -66,6 +66,7 @@ if CONFIG['MOZ_B2G_BT']: 'bluez/linux', ] DEFINES['MOZ_BLUETOOTH_DBUS'] = True + DEFINES['HAVE_PTHREADS'] = True FINAL_LIBRARY = 'gklayout'