system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-24 11:47:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix bthidd build with GCC 4.2 after r333110

Browse source 
Rename inlined function parameter to avoid shadowing of devname libc
function declared in stdlib.h header

Reported by:	lwhsu
Tested by:	lwhsu
This commit is contained in:
Vladimir Kondratyev 2018-05-01 08:03:12 +00:00
parent 971b5e4da8
commit fa3385055c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=333136
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libbluetooth/bluetooth.3
View file

@ -25,7 +25,7 @@
.\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $
.\" $FreeBSD$
.\"
.Dd April 30, 2018
.Dd May 1, 2018
.Dt BLUETOOTH 3
.Os
.Sh NAME
@ -132,7 +132,7 @@
.Fn bt_devremote_name "char const *devname" "const bdaddr_t *remote" \
"time_t to" "uint16_t clk_off" "uint8_t ps_rep_mode" "uint8_t ps_mode"
.Ft char *
.Fn bt_devremote_name_gen "char const *devname" "const bdaddr_t *remote"
.Fn bt_devremote_name_gen "char const *btooth_devname" "const bdaddr_t *remote"
.Ft int
.Fn bdaddr_same "const bdaddr_t *a" "const bdaddr_t *b"
.Ft int

4
lib/libbluetooth/bluetooth.h
View file

@ -189,9 +189,9 @@ int bt_devinfo (struct bt_devinfo *di);
int bt_devenum (bt_devenum_cb_t cb, void *arg);
static __inline char *
bt_devremote_name_gen(char const *devname, const bdaddr_t *remote)
bt_devremote_name_gen(char const *btooth_devname, const bdaddr_t *remote)
{
return (bt_devremote_name(devname, remote, 0, 0x0000,
return (bt_devremote_name(btooth_devname, remote, 0, 0x0000,
NG_HCI_SCAN_REP_MODE0, NG_HCI_MANDATORY_PAGE_SCAN_MODE));
}