From ed92f63f306838abe48f3a85e574ba9405610750 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 7 Apr 2013 16:12:32 +0100 Subject: [PATCH] gesture-action: avoid shadowing time() syscall function https://bugzilla.gnome.org/show_bug.cgi?id=698668 --- clutter/clutter-gesture-action.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c index 29b4b91e0..2f143e8f6 100644 --- a/clutter/clutter-gesture-action.c +++ b/clutter/clutter-gesture-action.c @@ -289,7 +289,7 @@ stage_captured_event_cb (ClutterActor *stage, gboolean return_value; GesturePoint *point; gfloat motion_x, motion_y; - gint64 time; + gint64 _time; if ((point = gesture_find_point (action, event, &position)) == NULL) return CLUTTER_EVENT_PROPAGATE; @@ -345,9 +345,9 @@ stage_captured_event_cb (ClutterActor *stage, point->last_motion_x = motion_x; point->last_motion_y = motion_y; - time = clutter_event_get_time (event); - point->last_delta_time = time - point->last_motion_time; - point->last_motion_time = time; + _time = clutter_event_get_time (event); + point->last_delta_time = _time - point->last_motion_time; + point->last_motion_time = _time; g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor, &return_value); @@ -382,8 +382,8 @@ stage_captured_event_cb (ClutterActor *stage, /* Treat the release event as the continuation of the last motion, * in case the user keeps the pointer still for a while before * releasing it. */ - time = clutter_event_get_time (event); - point->last_delta_time += time - point->last_motion_time; + _time = clutter_event_get_time (event); + point->last_delta_time += _time - point->last_motion_time; priv->in_gesture = FALSE; g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor);