diff options
| author | Jooseok Song <seogii.song@samsung.com> | 2016-12-19 13:52:32 +0900 |
|---|---|---|
| committer | Jooseok Song <seogii.song@samsung.com> | 2016-12-19 13:54:48 +0900 |
| commit | dbdcc158cad35e426829c1b977df7425e0cc0c8b (patch) | |
| tree | da670e202fc0db631d0b4969c6cad7b136a3472a | |
| parent | 908036bc14d4b0cf3cb86e2cc259ce4302a9d44d (diff) | |
| download | account-manager-dbdcc158cad35e426829c1b977df7425e0cc0c8b.tar.gz account-manager-dbdcc158cad35e426829c1b977df7425e0cc0c8b.tar.bz2 account-manager-dbdcc158cad35e426829c1b977df7425e0cc0c8b.zip | |
4.0 tool chain build error fixsubmit/tizen/20161219.045855accepted/tizen/wearable/20161219.224712accepted/tizen/mobile/20161219.224647accepted/tizen/ivi/20161219.224731accepted/tizen/common/20161219.152114
Change-Id: Ib1c387b9d40fca8cef8e65ebb2d273e36ac7c0c7
| -rw-r--r-- | server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | server/src/account-server-db.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 048051b..223edf6 100644 --- 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 --- 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); |