4.0 tool chain build error fix

Change-Id: Ib1c387b9d40fca8cef8e65ebb2d273e36ac7c0c7

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 048051b..223edf6 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -27,7 +27,7 @@ SET(SERVER_SRCS
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/include)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -Wno-int-conversion")
 SET(CMAKE_LDFLAGS "-Wl,-zdefs")
 
 ADD_EXECUTABLE(${DAEMON} ${SERVER_SRCS})

diff --git a/server/src/account-server-db.c b/server/src/account-server-db.c
index 0e4eb99..a288777 100644 (file)
--- a/server/src/account-server-db.c
+++ b/server/src/account-server-db.c
@@ -3456,7 +3456,7 @@ GSList* _account_type_get_label_list_by_app_id_from_global_db(const char* app_id
        GSList* label_list = NULL;
 
        ACCOUNT_RETURN_VAL((app_id != NULL), { *error_code = _ACCOUNT_ERROR_INVALID_PARAMETER; }, NULL, ("APP ID IS NULL"));
-       ACCOUNT_RETURN_VAL((g_hAccountGlobalDB != NULL), {}, _ACCOUNT_ERROR_DB_NOT_OPENED, ("The database isn't connected."));
+       ACCOUNT_RETURN_VAL((g_hAccountGlobalDB != NULL), { *error_code = _ACCOUNT_ERROR_DB_NOT_OPENED; }, NULL, ("The database isn't connected."));
 
        ACCOUNT_MEMSET(query, 0x00, ACCOUNT_SQL_LEN_MAX);
 
@@ -4115,7 +4115,7 @@ int _account_type_query_all_from_global_db(GSList **account_type_list_all)
        GSList *account_type_list = NULL;
 
        _INFO("_account_type_query_all_in_global_db start");
-       ACCOUNT_RETURN_VAL((g_hAccountGlobalDB != NULL), {}, NULL, ("The database isn't connected."));
+       ACCOUNT_RETURN_VAL((g_hAccountGlobalDB != NULL), {}, _ACCOUNT_ERROR_DB_NOT_OPENED, ("The database isn't connected."));
 
        ACCOUNT_MEMSET(query, 0x00, ACCOUNT_SQL_LEN_MAX);