Make sure bluez programs (cross-)compile, add missing statics.

Spotted by Blue Swirl.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5358 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/configure b/configure
index 826da7c01aeb2f956b7fdad8ac749f0aa42d60a1..53ad5d6c385ea28712fb698d0b0c2e884831c915 100755 (executable)
--- a/configure
+++ b/configure
@@ -900,8 +900,18 @@ if test "$bluez" = "yes" ; then
   `pkg-config bluez` || bluez="no"
 fi
 if test "$bluez" = "yes" ; then
+  cat > $TMPC << EOF
+#include <bluetooth/bluetooth.h>
+int main(void) { return bt_error(0); }
+EOF
   bluez_cflags=`pkg-config --cflags bluez`
   bluez_libs=`pkg-config --libs bluez`
+  if $cc $ARCH_CFLAGS -o $TMPE ${OS_FLAGS} $bluez_cflags $TMPC \
+      $bluez_libs 2> /dev/null ; then
+    :
+  else
+    bluez="no"
+  fi
 fi
 
 ##########################################

diff --git a/hw/bt-hci.c b/hw/bt-hci.c
index 36d551f3b495b878f3dddcdb1aef27fc324a6b8d..725e32c95d88268a57546b3dfba5f321ac6dc0f5 100644 (file)
--- a/hw/bt-hci.c
+++ b/hw/bt-hci.c
@@ -87,7 +87,7 @@ struct bt_hci_link_s {
 };
 
 /* LMP layer emulation */
-void bt_submit_lmp(struct bt_device_s *bt, int length, uint8_t *data)
+static void bt_submit_lmp(struct bt_device_s *bt, int length, uint8_t *data)
 {
     int resp, resplen, error, op, tr;
     uint8_t respdata[17];
@@ -2134,7 +2134,7 @@ static int bt_hci_bdaddr_set(struct HCIInfo *info, const uint8_t *bd_addr)
     return 0;
 }
 
-void bt_hci_done(struct HCIInfo *info);
+static void bt_hci_done(struct HCIInfo *info);
 static void bt_hci_destroy(struct bt_device_s *dev)
 {
     struct bt_hci_s *hci = hci_from_device(dev);
@@ -2181,7 +2181,7 @@ struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net)
     return &s->info;
 }
 
-void bt_hci_done(struct HCIInfo *info)
+static void bt_hci_done(struct HCIInfo *info)
 {
     struct bt_hci_s *hci = hci_from_info(info);
     int handle;