Fix build error for aarch64 27/113927/2 accepted/tizen/common/20170213.174442 accepted/tizen/ivi/20170214.010404 accepted/tizen/mobile/20170214.010232 accepted/tizen/tv/20170214.010258 accepted/tizen/wearable/20170214.010346 submit/tizen/20170213.020148
authoryeji01kim <yeji01.kim@samsung.com>
Thu, 9 Feb 2017 09:24:12 +0000 (18:24 +0900)
committerSungbae Yoo <sungbae.yoo@samsung.com>
Fri, 10 Feb 2017 04:42:06 +0000 (13:42 +0900)
Change-Id: I59ca68776c469c79014df1fd10f1d93105b2e55e
Signed-off-by: yeji01kim <yeji01.kim@samsung.com>
server/key-manager/luks.h
tools/apps/ode/src/ode-app-confirm.c

index c3fdf25..74ef9ce 100644 (file)
@@ -20,7 +20,7 @@
 #include <cstdint>
 
 struct LUKSHeader final {
-       char magic[6];
+       unsigned char magic[6];
        uint16_t version;
        char cipherName[32];
        char cipherMode[32];
index ffc5494..091c332 100755 (executable)
@@ -149,7 +149,7 @@ static char *sd_confirm_multiline_text_get(void *data, Evas_Object *obj, const c
                }
        };
 
-       char **text = genlist_text[(int)data];
+       char **text = genlist_text[(intptr_t)data];
 
        if (!strcmp(part, "elm.text"))
                return strdup(__(text[0]));
@@ -160,8 +160,8 @@ static char *sd_confirm_multiline_text_get(void *data, Evas_Object *obj, const c
 
 void radio_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       dlog_print(DLOG_INFO, LOG_TAG, "The value has changed %d\n", (int)data);
-       sdcard_option_selected = (int)data;
+       dlog_print(DLOG_INFO, LOG_TAG, "The value has changed %d\n", (intptr_t)data);
+       sdcard_option_selected = (intptr_t)data;
 
        dlog_print(DLOG_INFO, LOG_TAG, "sdcard_option_selected is  %d\n", sdcard_option_selected);
 }
@@ -169,7 +169,7 @@ void radio_changed_cb(void *data, Evas_Object *obj, void *event_info)
 static Evas_Object *sd_confirm_content_get(void *data, Evas_Object *obj, const char *part)
 {
        static Evas_Object *group = NULL;
-       int idx = (int)data;
+       int idx = (intptr_t)data;
 
        if (!strcmp(part, "elm.swallow.end")) {
                if (idx == 0) {
@@ -320,7 +320,7 @@ void ode_confirm_encrypt_sd_card_create_view(appdata_s *ad)
        itc = ode_create_genlist_item_class("multiline", sd_confirm_multiline_text_get, sd_confirm_content_get);
 
        for (index = 0; index < sdcard_option_num; index++) {
-               item = elm_genlist_item_append(genlist, itc, (void *)index, NULL, ELM_GENLIST_ITEM_NONE , NULL, NULL);
+               item = elm_genlist_item_append(genlist, itc, (void*)(intptr_t)index, NULL, ELM_GENLIST_ITEM_NONE , NULL, NULL);
                elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_NONE);
        }