From b208ae9d9e6a80ac173d334058da8ec6a945e6fb Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 25 Apr 2016 13:49:43 +0900 Subject: [PATCH] Fix "cast from pointer to integer of different size" on Windows Summary: On Windows 64 bits, long is 32 bits lonG Test Plan: compilatioN Reviewers: cedric, jpeg, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D3910 --- src/bin/elementary/test_explode.c | 6 +++--- src/bin/elementary/test_genlist.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/elementary/test_explode.c b/src/bin/elementary/test_explode.c index 63b1b4608f..6fc877251c 100644 --- a/src/bin/elementary/test_explode.c +++ b/src/bin/elementary/test_explode.c @@ -24,7 +24,7 @@ _cb_anim(void *data EINA_UNUSED, double pos) EINA_LIST_FOREACH(mirrors, l, o) { Evas_Map *m = evas_map_new(4); - int n = (int)((unsigned long)evas_object_data_get(o, "stack")); + int n = (int)((uintptr_t)evas_object_data_get(o, "stack")); double ang = (((double)(n + 1) * 20.0) / (double)tot); evas_map_util_points_populate_from_object(m, o); evas_map_util_3d_rotate(m, ang * v / 2.0, ang * v, 0, @@ -66,7 +66,7 @@ explode_obj(Evas_Object *obj, int n) evas_object_resize(m, w, h); evas_object_show(m); evas_object_color_set(m, 0, 0, 0, 128); - evas_object_data_set(m, "stack", (void *)((unsigned long)n)); + evas_object_data_set(m, "stack", (void *)((uintptr_t)n)); n++; @@ -81,7 +81,7 @@ explode_obj(Evas_Object *obj, int n) evas_object_move(m, x, y); evas_object_resize(m, w, h); evas_object_show(m); - evas_object_data_set(m, "stack", (void *)((unsigned long)n)); + evas_object_data_set(m, "stack", (void *)((uintptr_t)n)); } else { diff --git a/src/bin/elementary/test_genlist.c b/src/bin/elementary/test_genlist.c index eda321bdc4..c8ee4ed9cf 100644 --- a/src/bin/elementary/test_genlist.c +++ b/src/bin/elementary/test_genlist.c @@ -5142,7 +5142,7 @@ test_genlist_filter(void *data EINA_UNUSED, for (i = 0; i < 500; i++) elm_genlist_item_append(gl, itc, - (void *)(long)i, NULL, + (void *)(intptr_t)i, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);