cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f63243de3c1db0acc790ad6a11c9e4a495806df6
commit f63243de3c1db0acc790ad6a11c9e4a495806df6 Author: Cedric Bail <[email protected]> Date: Thu Sep 26 16:34:35 2013 +0900 elementary: cast an uintptr_t when pushing stuff into a pointer. --- src/lib/elm_app_client_view.c | 10 +++++----- src/lib/elm_widget.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c index 30962e6..d669d2b 100644 --- a/src/lib/elm_app_client_view.c +++ b/src/lib/elm_app_client_view.c @@ -93,19 +93,19 @@ _prop_changed(void *user_data, Eldbus_Proxy *proxy EINA_UNUSED, void *event_info NULL, NULL)); else if (!strcmp(prop_event->name, "NewEvents")) eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EV_NEW_EVENTS_CHANGED, - (void *)(long)_int_prop_get(v), NULL)); + (void *)(uintptr_t)_int_prop_get(v), NULL)); else if (!strcmp(prop_event->name, "Progress")) eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EV_PROGRESS_CHANGED, - (void *)(long)_short_prop_get(v), NULL)); + (void *)(uintptr_t)_short_prop_get(v), NULL)); else if (!strcmp(prop_event->name, "State")) { cdata->state = _string_state_to_id(_string_prop_get(v)); eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EV_STATE_CHANGED, - (void *)(long)cdata->state, NULL)); + (void *)(uintptr_t)cdata->state, NULL)); } else if (!strcmp(prop_event->name, "WindowId")) eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EV_WINDOW_CHANGED, - (void *)(long)_int_prop_get(v), NULL)); + (void *)(uintptr_t)_int_prop_get(v), NULL)); else return; @@ -149,7 +149,7 @@ elm_app_client_view_internal_state_set(Eo *eo, Elm_App_View_State state) if (!changed) return; eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EV_STATE_CHANGED, - (void *)(long)cdata->state, NULL)); + (void *)(uintptr_t)cdata->state, NULL)); } static void diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 77b8700..f88a70f 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -1318,13 +1318,13 @@ _elm_widget_can_focus_set(Eo *obj, void *_pd, va_list *list) evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _propagate_event, - (void *)(long)EVAS_CALLBACK_KEY_DOWN); + (void *)(uintptr_t)EVAS_CALLBACK_KEY_DOWN); evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_UP, _propagate_event, - (void *)(long)EVAS_CALLBACK_KEY_UP); + (void *)(uintptr_t)EVAS_CALLBACK_KEY_UP); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_WHEEL, _propagate_event, - (void *)(long)EVAS_CALLBACK_MOUSE_WHEEL); + (void *)(uintptr_t)EVAS_CALLBACK_MOUSE_WHEEL); } else { --
