|
 |
ee2351 |
From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
|
|
|
ee2351 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
ee2351 |
Date: Wed, 3 Mar 2021 08:57:36 +0100
|
|
|
ee2351 |
Subject: [PATCH] media: rename local function conflicting with pause(2)
|
|
|
ee2351 |
|
|
|
ee2351 |
profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)'
|
|
|
ee2351 |
1284 | static bool pause(void *user_data)
|
|
|
ee2351 |
| ^~~~~
|
|
|
ee2351 |
In file included from /usr/include/bits/sigstksz.h:24,
|
|
|
ee2351 |
from /usr/include/signal.h:315,
|
|
|
ee2351 |
from /usr/include/glib-2.0/glib/gbacktrace.h:36,
|
|
|
ee2351 |
from /usr/include/glib-2.0/glib.h:34,
|
|
|
ee2351 |
from profiles/audio/media.c:21:
|
|
|
ee2351 |
/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)'
|
|
|
ee2351 |
478 | extern int pause (void);
|
|
|
ee2351 |
| ^~~~~
|
|
|
ee2351 |
---
|
|
|
ee2351 |
profiles/audio/media.c | 4 ++--
|
|
|
ee2351 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
ee2351 |
|
|
|
ee2351 |
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
|
|
|
ee2351 |
index c84bbe22dc..3d8c4b69c3 100644
|
|
|
ee2351 |
--- a/profiles/audio/media.c
|
|
|
ee2351 |
+++ b/profiles/audio/media.c
|
|
|
ee2351 |
@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
|
|
|
ee2351 |
return media_player_send(mp, "Stop");
|
|
|
ee2351 |
}
|
|
|
ee2351 |
|
|
|
ee2351 |
-static bool pause(void *user_data)
|
|
|
ee2351 |
+static bool pause_play(void *user_data)
|
|
|
ee2351 |
{
|
|
|
ee2351 |
struct media_player *mp = user_data;
|
|
|
ee2351 |
|
|
|
ee2351 |
@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
|
|
|
ee2351 |
.set_volume = set_volume,
|
|
|
ee2351 |
.play = play,
|
|
|
ee2351 |
.stop = stop,
|
|
|
ee2351 |
- .pause = pause,
|
|
|
ee2351 |
+ .pause = pause_play,
|
|
|
ee2351 |
.next = next,
|
|
|
ee2351 |
.previous = previous,
|
|
|
ee2351 |
};
|