Fix conflict with unistd.h
This commit is contained in:
		
							parent
							
								
									9946daa905
								
							
						
					
					
						commit
						fdda690e47
					
				| @ -0,0 +1,42 @@ | ||||
| From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001 | ||||
| From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | ||||
| 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, | ||||
|  }; | ||||
| @ -25,6 +25,7 @@ Patch10: 0001-build-Always-define-confdir-and-statedir.patch | ||||
| Patch11: 0002-systemd-Add-PrivateTmp-and-NoNewPrivileges-options.patch | ||||
| Patch12: 0003-systemd-Add-more-filesystem-lockdown.patch | ||||
| Patch13: 0004-systemd-More-lockdown.patch | ||||
| Patch14: 0005-media-rename-local-function-conflicting-with-pause-2.patch | ||||
| 
 | ||||
| BuildRequires: dbus-devel >= 1.6 | ||||
| BuildRequires: glib2-devel | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user