[Qemu-devel] [5358] Make sure bluez programs (cross-)compile, add missing statics.

[Andrzej Zaborowski]

Revision: 5358
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5358
Author:   balrog
Date:     2008-09-30 02:27:44 +0000 (Tue, 30 Sep 2008)

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

Spotted by Blue Swirl.

Modified Paths:
--------------
    trunk/configure
    trunk/hw/bt-hci.c

Modified: trunk/configure
===================================================================
--- trunk/configure     2008-09-29 18:24:38 UTC (rev 5357)
+++ trunk/configure     2008-09-30 02:27:44 UTC (rev 5358)
@@ -900,8 +900,18 @@
   `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
 
 ##########################################

Modified: trunk/hw/bt-hci.c
===================================================================
--- trunk/hw/bt-hci.c   2008-09-29 18:24:38 UTC (rev 5357)
+++ trunk/hw/bt-hci.c   2008-09-30 02:27:44 UTC (rev 5358)
@@ -87,7 +87,7 @@
 };
 
 /* 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 @@
     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 @@
     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;