Fix build error if _USE_SENIOR_MODE is defined 82/132082/1 accepted/tizen/unified/20170601.234905 submit/tizen/20170601.050023
authorJiyong Min <jiyong.min@samsung.com>
Thu, 1 Jun 2017 04:45:55 +0000 (13:45 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Thu, 1 Jun 2017 04:47:10 +0000 (13:47 +0900)
Change-Id: I69f1598544b1e186d296b68e3a7d6bdb0d092a2e
Signed-off-by: jiyong min <jiyong.min@samsung.com>
lib/media-util-register.c
lib/media-util-user.c
packaging/media-server.spec

index dcce33f..50f4974 100755 (executable)
@@ -58,23 +58,6 @@ typedef struct media_scan_data {
 
 GArray *req_list;
 
-#ifdef _USE_SENIOR_MODE
-static bool media_util_is_support_senior_mode();
-bool media_util_is_support_senior_mode()
-{
-       bool bSupportSeniorMode = false;
-
-       if (system_info_get_value_bool(SYSTEM_INFO_KEY_GET_SENIOR_MODE_SUPPORTED, &bSupportSeniorMode) != SYSTEM_INFO_ERROR_NONE) {
-               MSAPI_DBG("Get familytv Support failed");
-               return false;
-       }
-
-       MSAPI_DBG("FamilyTv Support : [%d]", bSupportSeniorMode);
-
-       return bSupportSeniorMode;
-}
-#endif
-
 static int _check_dir_path(const char *dir_path, uid_t uid)
 {
        struct stat sb;
index 6619752..9e3e66d 100755 (executable)
 #include "media-util.h"
 #include <glib.h>
 
+#ifdef _USE_SENIOR_MODE
+bool _ms_is_support_senior_mode()
+{
+       bool bSupportSeniorMode = false;
+
+       if (system_info_get_value_bool(SYSTEM_INFO_KEY_GET_SENIOR_MODE_SUPPORTED, &bSupportSeniorMode) != SYSTEM_INFO_ERROR_NONE) {
+               MSAPI_DBG("Get familytv Support failed");
+               return false;
+       }
+
+       MSAPI_DBG("FamilyTv Support : [%d]", bSupportSeniorMode);
+
+       return bSupportSeniorMode;
+}
+#endif
+
 int ms_user_get_internal_root_path(uid_t uid, char **path)
 {
        int ret = MS_MEDIA_ERR_NONE;
@@ -56,7 +72,7 @@ int ms_user_get_storage_type(uid_t uid, const char *path, ms_user_storage_type_t
        }
 
 #ifdef _USE_SENIOR_MODE
-       if (ms_is_support_senior_mode()) {
+       if (_ms_is_support_senior_mode()) {
                if (strncmp(path, MEDIA_ROOT_PATH_SENIOR_MODE, strlen(MEDIA_ROOT_PATH_SENIOR_MODE)) == 0) {
                        *storage_type = MS_USER_STORAGE_EXTERNAL;
                        return MS_MEDIA_ERR_NONE;
index 6e59d16..d7c6bd4 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.41
+Version:    0.3.42
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0