summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5/bluez5
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-05-01 10:46:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-02 23:21:42 +0100
commit3ca350ebe741cbc60b587120a1488915fa941837 (patch)
tree5a779dc5dd3e0a009c519f0dd4c1108d0655dd57 /meta/recipes-connectivity/bluez5/bluez5
parente4f7cdf98876923eb253a40459b084c17a780440 (diff)
downloadpoky-3ca350ebe741cbc60b587120a1488915fa941837.tar.gz
bluez: Fix shadowing of pause function from libc
(From OE-Core rev: d5e0d319fc714a5af59ebec0b3a89851c04a6c4f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5/bluez5')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch
new file mode 100644
index 0000000000..d9067df02d
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch
@@ -0,0 +1,48 @@
1From 8adab7f1e04948e78854953f9373cac741445a0f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 30 Apr 2021 21:09:33 -0700
4Subject: [PATCH] audio: Rename pause funciton to avoid shadowing glibc
5 defintions
6
7Fixes
8profiles/audio/media.c:1284:13: error: static declaration of 'pause' follows non-static declaration
9static bool pause(void *user_data)
10 ^
11/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/bluez5/5.56-r0/recipe-sysroot/usr/include/unistd.h:478:12: note: previous declaration is here
12extern int pause (void);
13 ^
14../bluez-5.56/profiles/audio/media.c:1334:11: warning: incompatible function pointer types initializing 'bool (*)(void *)' with an expression of type 'int (void)' [-Wincompatible-function-pointer-types]
15 .pause = pause,
16 ^~~~~
17
18Upstream-Status: Pending
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 profiles/audio/media.c | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/profiles/audio/media.c b/profiles/audio/media.c
25index c84bbe2..7110089 100644
26--- a/profiles/audio/media.c
27+++ b/profiles/audio/media.c
28@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
29 return media_player_send(mp, "Stop");
30 }
31
32-static bool pause(void *user_data)
33+static bool apause(void *user_data)
34 {
35 struct media_player *mp = user_data;
36
37@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
38 .set_volume = set_volume,
39 .play = play,
40 .stop = stop,
41- .pause = pause,
42+ .pause = apause,
43 .next = next,
44 .previous = previous,
45 };
46--
472.31.1
48