patch to fix conflict with unistd.h

Commit Message

Zbigniew Jędrzejewski-Szmek March 3, 2021, 8:19 a.m. UTC

Comments

Luiz Augusto von Dentz March 4, 2021, 4:37 p.m. UTC | #1

Hi Zbigniew,

On Thu, Mar 4, 2021 at 1:02 AM Zbigniew Jędrzejewski-Szmek
<[e-mail]> wrote:
>

Can you send it as a proper patch, look at HACKING if you don't know
how to send it using e.g. git send-patch.

Bastien Nocera March 4, 2021, 4:42 p.m. UTC | #2

On Thu, 2021-03-04 at 08:37 -0800, Luiz Augusto von Dentz wrote:
> Hi Zbigniew,
> 
> On Thu, Mar 4, 2021 at 1:02 AM Zbigniew Jędrzejewski-Szmek
> <[e-mail]> wrote:
> > 
> 
> Can you send it as a proper patch, look at HACKING if you don't know
> how to send it using e.g. git send-patch.

Let me know if you want me to do it, I have all that already set up.

Zbigniew Jędrzejewski-Szmek March 4, 2021, 6:53 p.m. UTC | #3

On Thu, Mar 04, 2021 at 08:37:04AM -0800, Luiz Augusto von Dentz wrote:
> Hi Zbigniew,
> 
> On Thu, Mar 4, 2021 at 1:02 AM Zbigniew Jędrzejewski-Szmek
> <[e-mail]> wrote:
> >
> 
> Can you send it as a proper patch, look at HACKING if you don't know
> how to send it using e.g. git send-patch.

Can you be more precise? What was wrong with the first version.

Zbyszek

Zbigniew Jędrzejewski-Szmek March 5, 2021, 2:02 p.m. UTC | #4

On Thu, Mar 04, 2021 at 06:53:48PM +0000, Zbigniew Jędrzejewski-Szmek wrote:
> On Thu, Mar 04, 2021 at 08:37:04AM -0800, Luiz Augusto von Dentz wrote:
> > Hi Zbigniew,
> > 
> > On Thu, Mar 4, 2021 at 1:02 AM Zbigniew Jędrzejewski-Szmek
> > <[e-mail]> wrote:
> > >
> > 
> > Can you send it as a proper patch, look at HACKING if you don't know
> > how to send it using e.g. git send-patch.
> 
> Can you be more precise? What was wrong with the first version.

Anyway, the patch is here for anyone who wants to grab it:
https://src.fedoraproject.org/rpms/bluez/raw/fdda690e478cc1581c12265af16d043c757758dd/f/0005-media-rename-local-function-conflicting-with-pause-2.patch

Zbyszek

Luiz Augusto von Dentz March 5, 2021, 9:47 p.m. UTC | #5

Hi Zbigniew,

On Fri, Mar 5, 2021 at 6:02 AM Zbigniew Jędrzejewski-Szmek
<[e-mail]> wrote:
>
> On Thu, Mar 04, 2021 at 06:53:48PM +0000, Zbigniew Jędrzejewski-Szmek wrote:
> > On Thu, Mar 04, 2021 at 08:37:04AM -0800, Luiz Augusto von Dentz wrote:
> > > Hi Zbigniew,
> > >
> > > On Thu, Mar 4, 2021 at 1:02 AM Zbigniew Jędrzejewski-Szmek
> > > <[e-mail]> wrote:
> > > >
> > >
> > > Can you send it as a proper patch, look at HACKING if you don't know
> > > how to send it using e.g. git send-patch.
> >
> > Can you be more precise? What was wrong with the first version.
>
> Anyway, the patch is here for anyone who wants to grab it:
> https://src.fedoraproject.org/rpms/bluez/raw/fdda690e478cc1581c12265af16d043c757758dd/f/0005-media-rename-local-function-conflicting-with-pause-2.patch
>
> Zbyszek

https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/HACKING#n98

We need proper patches so it trigger CI, PW, etc and once that is
validated I can git am directly, attachments and links don't work for
that purpose.

Patch

From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[e-mail]>
Date: Wed, 3 Mar 2021 08:57:36 +0100
Subject: [PATCH] media: rename local function conflicting with pause(2)

profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)'
 1284 | static bool pause(void *user_data)
      |             ^~~~~
In file included from /usr/include/bits/sigstksz.h:24,
                 from /usr/include/signal.h:315,
                 from /usr/include/glib-2.0/glib/gbacktrace.h:36,
                 from /usr/include/glib-2.0/glib.h:34,
                 from profiles/audio/media.c:21:
/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)'
  478 | extern int pause (void);
      |            ^~~~~
---
 profiles/audio/media.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index c84bbe22dc..3d8c4b69c3 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1281,7 +1281,7 @@  static bool stop(void *user_data)
 	return media_player_send(mp, "Stop");
 }
 
-static bool pause(void *user_data)
+static bool pause_play(void *user_data)
 {
 	struct media_player *mp = user_data;
 
@@ -1331,7 +1331,7 @@  static struct avrcp_player_cb player_cb = {
 	.set_volume = set_volume,
 	.play = play,
 	.stop = stop,
-	.pause = pause,
+	.pause = pause_play,
 	.next = next,
 	.previous = previous,
 };