From 8b20d6c25d7092c61fceff1803841d61bb864405 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Mon, 20 Aug 2018 10:49:17 +0900 Subject: [PATCH] Fix ASAN build break Declaration of g_focus_sound_handle array is moved to mm_sound_focus_private.c [Version] 0.12.27 [Issue Type] Bug fix Change-Id: Idc5a03f7df22763b4cf71762489d7f4c0d7df45b Signed-off-by: Sangchul Lee --- include/mm_sound_focus_private.h | 2 +- mm_sound_client.c | 2 -- mm_sound_focus_private.c | 2 ++ mm_sound_proxy.c | 2 -- packaging/libmm-sound.spec | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/mm_sound_focus_private.h b/include/mm_sound_focus_private.h index d84bb79..b4e1893 100644 --- a/include/mm_sound_focus_private.h +++ b/include/mm_sound_focus_private.h @@ -62,7 +62,7 @@ typedef struct { } focus_cb_data_lib; typedef gboolean(*focus_callback_handler_t)(gpointer user_data); -focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX]; +extern focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX]; int focus_find_empty_index(int *handle); int focus_find_index_by_handle(int handle); diff --git a/mm_sound_client.c b/mm_sound_client.c index b732824..3cbdf91 100644 --- a/mm_sound_client.c +++ b/mm_sound_client.c @@ -38,8 +38,6 @@ #define CLIENT_HANDLE_MAX 256 #define VOLUME_TYPE_LEN 64 -extern focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX]; - struct callback_data { void *user_cb; void *user_data; diff --git a/mm_sound_focus_private.c b/mm_sound_focus_private.c index 271a5e5..c781840 100644 --- a/mm_sound_focus_private.c +++ b/mm_sound_focus_private.c @@ -33,6 +33,8 @@ #include #include "include/mm_sound_focus_private.h" +focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX]; + static gpointer _focus_thread_func(gpointer data) { unsigned int thread_id = (unsigned int)pthread_self(); diff --git a/mm_sound_proxy.c b/mm_sound_proxy.c index a1fb15b..fb65ec8 100644 --- a/mm_sound_proxy.c +++ b/mm_sound_proxy.c @@ -15,8 +15,6 @@ #include "include/mm_sound_focus_socket.h" #include "include/mm_sound_focus_private.h" -extern focus_sound_info_t g_focus_sound_handle[FOCUS_HANDLE_MAX]; - struct callback_data { void *user_cb; void *user_data; diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec index a2e2273..dee1379 100644 --- a/packaging/libmm-sound.spec +++ b/packaging/libmm-sound.spec @@ -1,6 +1,6 @@ Name: libmm-sound Summary: MMSound Package contains client lib and sound_server binary -Version: 0.12.26 +Version: 0.12.27 Release: 0 Group: System/Libraries License: Apache-2.0 -- 2.7.4