mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Spotted by Blue Swirl.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5358 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-09-30 02:27:44 +00:00
parent ada24f8466
commit e820e3f459
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -900,8 +900,18 @@ if test "$bluez" = "yes" ; then
`pkg-config bluez` || bluez="no" `pkg-config bluez` || bluez="no"
fi fi
if test "$bluez" = "yes" ; then 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_cflags=`pkg-config --cflags bluez`
bluez_libs=`pkg-config --libs 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 fi
########################################## ##########################################

6
hw/bt-hci.c
View File

@ -87,7 +87,7 @@ struct bt_hci_link_s {
}; };
/* LMP layer emulation */ /* 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; int resp, resplen, error, op, tr;
uint8_t respdata[17]; uint8_t respdata[17];
@ -2134,7 +2134,7 @@ static int bt_hci_bdaddr_set(struct HCIInfo *info, const uint8_t *bd_addr)
return 0; 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) static void bt_hci_destroy(struct bt_device_s *dev)
{ {
struct bt_hci_s *hci = hci_from_device(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; 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); struct bt_hci_s *hci = hci_from_info(info);
int handle; int handle;