From 43369fc103ef3cdcf9c41ba55493a9462b24b405 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 21 Jun 2016 16:43:30 +0000 Subject: [PATCH] net.c: use AF_BLUETOOTH unconditionally * net.c (print_sockaddr, SYS_FUNC(socket)): Do not check for AF_BLUETOOTH availability. --- net.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net.c b/net.c index 11d4a8aa..ef42219f 100644 --- a/net.c +++ b/net.c @@ -222,7 +222,8 @@ print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen) case AF_NETLINK: tprintf("pid=%d, groups=%08x", addr->nl.nl_pid, addr->nl.nl_groups); break; -#if defined(AF_BLUETOOTH) && defined(HAVE_BLUETOOTH_BLUETOOTH_H) + +#ifdef HAVE_BLUETOOTH_BLUETOOTH_H case AF_BLUETOOTH: tprintf("{sco_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X} or " "{rc_bdaddr=%02X:%02X:%02X:%02X:%02X:%02X, rc_channel=%d} or " @@ -241,7 +242,8 @@ print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen) addr->l2.l2_bdaddr.b[5], btohs(addr->l2.l2_cid), btohs(addr->hci.hci_dev)); break; -#endif /* AF_BLUETOOTH && HAVE_BLUETOOTH_BLUETOOTH_H */ +#endif /* HAVE_BLUETOOTH_BLUETOOTH_H */ + /* AF_AX25 AF_APPLETALK AF_NETROM AF_BRIDGE AF_AAL5 AF_X25 AF_ROSE etc. still need to be done */ @@ -778,7 +780,7 @@ SYS_FUNC(socket) printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???"); break; -#if defined(AF_BLUETOOTH) && defined(HAVE_BLUETOOTH_BLUETOOTH_H) +#ifdef HAVE_BLUETOOTH_BLUETOOTH_H case AF_BLUETOOTH: printxval(bt_protocols, tcp->u_arg[2], "BTPROTO_???"); break; -- 2.50.1