From 72c737c67321309951aad581d473114a61b6c188 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Tue, 7 Jun 2016 19:12:04 +0900 Subject: [PATCH] Fixed errors when dynamic so file was created. - Fixed canNOT found the __is_available_font func - Fixed wrong function name about get font size Change-Id: Ieba97dd135a365fcaeaa11dfa4938bb17a4ad22d Signed-off-by: JinWang An --- src/system_setting_platform.c | 8 ++++---- system-settings-util/CMakeLists.txt | 3 +-- system-settings-util/src/system_settings_util.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c index 19551b8..87d7710 100644 --- a/src/system_setting_platform.c +++ b/src/system_setting_platform.c @@ -339,9 +339,9 @@ int dl_is_available_font(char *str) return false; } - check_available_font = dlsym(handle, "_is_available_font"); + check_available_font = dlsym(handle, "__is_available_font"); if ((error = dlerror()) != NULL) { - SETTING_TRACE("ERROR!! canNOT find font_config_set function at libsystem-settings-util.so.0.1.0"); + SETTING_TRACE("ERROR!! canNOT find __is_available_font function at libsystem-settings-util.so.0.1.0"); if (handle) dlclose(handle); return false; @@ -366,7 +366,7 @@ void dl_font_size_set() set_font_size = dlsym(handle, "__font_size_set"); if ((error = dlerror()) != NULL) { - SETTING_TRACE("ERROR!! canNOT find font_config_set function at libsystem-settings-util.so.0.1.0"); + SETTING_TRACE("ERROR!! canNOT find __font_size_set function at libsystem-settings-util.so.0.1.0"); if (handle) dlclose(handle); return; @@ -391,7 +391,7 @@ void dl_font_config_set_notification() set_font_nodification = dlsym(handle, "font_config_set_notification"); if ((error = dlerror()) != NULL) { - SETTING_TRACE("ERROR!! canNOT find font_config_set function at libsystem-settings-util.so.0.1.0"); + SETTING_TRACE("ERROR!! canNOT find font_config_set_notification function at libsystem-settings-util.so.0.1.0"); if (handle) dlclose(handle); return; diff --git a/system-settings-util/CMakeLists.txt b/system-settings-util/CMakeLists.txt index a1a238f..c0a69fa 100755 --- a/system-settings-util/CMakeLists.txt +++ b/system-settings-util/CMakeLists.txt @@ -14,8 +14,7 @@ FOREACH(flag ${system_settings_util_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Werror-implicit-function-declaration") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Werror-implicit-function-declaration") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") diff --git a/system-settings-util/src/system_settings_util.c b/system-settings-util/src/system_settings_util.c index 27f03f4..ed31007 100644 --- a/system-settings-util/src/system_settings_util.c +++ b/system-settings-util/src/system_settings_util.c @@ -490,7 +490,7 @@ int __font_size_get() int font_size = -1; int vconf_value = -1; - if (system_setting_vconf_get_value_int(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, &vconf_value)) { + if (vconf_get_int(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, &vconf_value)) { return -1; } -- 2.7.4