code.ossystems Code Review - openembedded-core.git/blob

   1 From 8adab7f1e04948e78854953f9373cac741445a0f Mon Sep 17 00:00:00 2001
   2 From: Khem Raj <raj.khem@gmail.com>
   3 Date: Fri, 30 Apr 2021 21:09:33 -0700
   4 Subject: [PATCH] audio: Rename pause funciton to avoid shadowing glibc
   5  defintions
   6
   7 Fixes
   8 profiles/audio/media.c:1284:13: error: static declaration of 'pause' follows non-static declaration
   9 static 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
  12 extern 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
  18 Upstream-Status: Pending
  19 Signed-off-by: Khem Raj <raj.khem@gmail.com>
  20 ---
  21  profiles/audio/media.c | 4 ++--
  22  1 file changed, 2 insertions(+), 2 deletions(-)
  23
  24 diff --git a/profiles/audio/media.c b/profiles/audio/media.c
  25 index 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 --
  47 2.31.1
  48