From: MyoungJune Park Date: Tue, 29 Nov 2016 04:13:21 +0000 (-0800) Subject: Merge "Added so file path for aarch64 and x86_64." into tizen X-Git-Tag: accepted/tizen/common/20161214.160218~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0782c5a08d54fb7a15e82f4fae2499bae315238e;p=platform%2Fcore%2Fapi%2Fsystem-settings.git Merge "Added so file path for aarch64 and x86_64." into tizen --- 0782c5a08d54fb7a15e82f4fae2499bae315238e diff --cc src/system_setting_platform.c index 4219bbb,fd0f945..0a0f003 --- a/src/system_setting_platform.c +++ b/src/system_setting_platform.c @@@ -62,15 -57,11 +62,20 @@@ #define SETTING_TIME_SHARE_LOCAL_PATH "/usr/share/locale" #define SETTING_TZONE_SYMLINK_PATH "/opt/etc/localtime" + +#define __FREE(del, arg) do { \ + if (arg) { \ + del((void *)(arg)); /*cast any argument to (void*) to avoid build warring*/\ + arg = NULL; \ + } \ + } while (0); +#define FREE(arg) __FREE(free, arg) + + #ifdef SETTING_ARCH_64 + #define SETTING_UTILS_SO_FILE_PATH "/usr/lib64/libsystem-settings-util.so.0.1.0" + #else + #define SETTING_UTILS_SO_FILE_PATH "/usr/lib/libsystem-settings-util.so.0.1.0" + #endif int _is_file_accessible(const char *path);