Improve Portability: Support 64bit Systems

You cannot directly cast from 64b pointer to 32b int or
32b int to 64b pointer.

Change-Id: I3096ee1c167ac594ae04b2e6f283cac9890d7938
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/src/allowed-calls.c b/src/allowed-calls.c
index 895b877a9d2ce378f4449211aa61545c27f0b9de..c66348a95607133382f916a33b9844eea0a97427 100755 (executable)
--- a/src/allowed-calls.c
+++ b/src/allowed-calls.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include <stdint.h>
 #include "allowed-calls.h"
 #include <Evas.h>
 
@@ -112,7 +113,7 @@ static char *gl_text_get_cb(void *data, Evas_Object *obj, const char *part)
 {
     if(!strcmp(part, "elm.text"))
     {
-        int index = (int)data;
+        int index = (uintptr_t)data;
         return strdup(APP_STRING(items[index]));
     }
     return NULL;
@@ -272,7 +273,7 @@ static void gl_sel_cb(void *data, Evas_Object *obj, void *event_info)
     int index = 0;
     Elm_Object_Item *item = event_info;
 
-    index = (int)elm_object_item_data_get(item);
+    index = (uintptr_t)elm_object_item_data_get(item);
     switch (index)
     {
         case 0:
@@ -335,7 +336,7 @@ static void create_allow_calls_from_popup()
     itc.func.del = NULL;
 
     for (i = 0; i < 4; i++) {
-        elm_genlist_item_append(genlist, &itc, (void *)i, NULL, ELM_GENLIST_ITEM_NONE, gl_sel_cb, popup);
+        elm_genlist_item_append(genlist, &itc, (void *)(uintptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, gl_sel_cb, popup);
     }
 
     evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/src/app-details.c b/src/app-details.c
index 219f685f5363ea446e4a70fe32f95838b8ee9925..0b670a778ed7824728ad0c996c2c13bcb4ffce84 100644 (file)
--- a/src/app-details.c
+++ b/src/app-details.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include <stdint.h>
 #include "app-details.h"
 #include <badge.h>
 #include <badge_internal.h>
@@ -291,7 +292,7 @@ static char *gl_text_get_cb(void *data, Evas_Object *obj, const char *part)
 {
     if(!strcmp(part, "elm.text"))
     {
-        int index = (int)data;
+        int index = (uintptr_t)data;
         return strdup(APP_STRING(items[index]));
     }
     return NULL;
@@ -301,7 +302,7 @@ static Evas_Object *gl_content_get_cb(void *data, Evas_Object *obj, const char *
 {
     if(!strcmp(part, "elm.swallow.end"))
     {
-        int index = (int)data;
+        int index = (uintptr_t)data;
         Evas_Object *radio = NULL;
         Evas_Object *radio_main = evas_object_data_get(obj, "radio");
         radio = elm_radio_add(obj);
@@ -327,7 +328,7 @@ static void gl_radio_sel_cb(void *data, Evas_Object *obj, void *event_info)
 
     elm_genlist_item_selected_set(it, EINA_FALSE);
     radio = elm_object_item_part_content_get(it, "elm.swallow.end");
-    int index = (int)elm_object_item_data_get(it);
+    int index = (uintptr_t)elm_object_item_data_get(it);
     elm_radio_value_set(radio, index);
 
     int err = notification_setting_get_setting_by_package_name(g_app_info->appid, &setting);
@@ -409,7 +410,7 @@ static void show_noti_on_lock_popup()
     int i = 0;
     for (; i < AMOUNT_OF_CONTENT_ITEMS; i++)
     {
-        elm_genlist_item_append(genlist, &itc, (void *)i, NULL, ELM_GENLIST_ITEM_NONE, gl_radio_sel_cb, popup);
+        elm_genlist_item_append(genlist, &itc, (void *)(uintptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, gl_radio_sel_cb, popup);
     }
 
     evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/src/common-efl.c b/src/common-efl.c
index 1107223e71a5f8aa711f4e2d71dfd0c0a961f6c2..dbcbded4caa7a75828ee48ea983b8964e8834691 100755 (executable)
--- a/src/common-efl.c
+++ b/src/common-efl.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include <stdint.h>
 #include "pkgmgr-setting-info.h"
 #include "common-efl.h"
 #include "set-schedule-info.h"
@@ -272,7 +273,7 @@ static void gl_radio_sel_cb(void *data, Evas_Object *obj, void *event_info)
 {
     NOTISET_TRACE_BEGIN;
     Elm_Object_Item *it = event_info;
-    int index = (int)data;
+    int index = (uintptr_t)data;
 
     Evas_Object *radio = NULL;
 
@@ -322,7 +323,7 @@ void append_gl_radio_item_list(Evas_Object *genlist, Eina_List* list, char *styl
                                 NULL,                           /* parent item */
                                 ELM_GENLIST_ITEM_NONE,          /* item type */
                                 gl_radio_sel_cb,                /* select smart callback */
-                                (void *)count);                 /* smart callback user data */
+                                (void *)(uintptr_t)count);                 /* smart callback user data */
         list = eina_list_next(list);
         ++count;
     }
@@ -330,7 +331,7 @@ void append_gl_radio_item_list(Evas_Object *genlist, Eina_List* list, char *styl
 
     int index = get_lock_screen_content_setting();
     elm_radio_value_set(radio, index);
-    gl_radio_sel_cb((void *)index, genlist, NULL);
+    gl_radio_sel_cb((void *)(uintptr_t)index, genlist, NULL);
 }
 
 void append_gl_item_list(Evas_Object *genlist, Eina_List* list, int style, char *ugName)