Skip to contentSkip to conversation

patch to fix conflict with unistd.h

PATCH Zbigniew Jędrzejewski-Szmek 3 participants 6 messages Mar 3, 2021 – Mar 5, 2021 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
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(-)
profiles/audio/media.c +2 -2
index c84bbe22dc..3d8c4b69c3 100644
@@ -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,
 };
#1 lore raw

Hi Zbigniew,

Quoted 1 line · Zbigniew Jędrzejewski-Szmek

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.

Signature · 1 line
Luiz Augusto von Dentz
#2 lore raw
Quoted 8 lines · Luiz Augusto von Dentz

Hi Zbigniew,

Quoted 1 line · Zbigniew Jędrzejewski-Szmek

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.

#3 lore raw
In reply to Luiz Augusto von Dentz
Quoted 8 lines · Luiz Augusto von Dentz

Hi Zbigniew,

Quoted 1 line · Zbigniew Jędrzejewski-Szmek

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

#4 lore raw
Quoted 11 lines · Zbigniew Jędrzejewski-Szmek
Quoted 8 lines · Luiz Augusto von Dentz

Hi Zbigniew,

Quoted 1 line · Zbigniew Jędrzejewski-Szmek

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

#5 lore raw

Hi Zbigniew,

Quoted 12 lines · Zbigniew Jędrzejewski-Szmek
Quoted 10 lines · Zbigniew Jędrzejewski-Szmek
Quoted 8 lines · Luiz Augusto von Dentz

Hi Zbigniew,

Quoted 1 line · Zbigniew Jędrzejewski-Szmek

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.

Quoted 6 lines
Quoted 1 line

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.

Signature · 1 line
Luiz Augusto von Dentz