diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-30 02:27:44 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-30 02:27:44 +0000 |
| commit | e820e3f4597d52bf0d7f5e53800703001e356d17 (patch) | |
| tree | 0851a908f3934ea1dd7b1bece877e01699bb35a4 | |
| parent | ada24f846650ad2e64c92178d233e380db141427 (diff) | |
| download | qemu-e820e3f4597d52bf0d7f5e53800703001e356d17.tar.gz | |
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
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | hw/bt-hci.c | 6 |
2 files changed, 13 insertions, 3 deletions
@@ -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 36d551f3b4..725e32c95d 100644 --- 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; |