diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2013-04-07 16:12:32 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2013-04-23 17:39:25 +0100 |
| commit | 484672600b98ce1deb1c18592cb201567152ae79 (patch) | |
| tree | 24136ce1325e3c5c51b7b6624ed2b67df3a099f8 | |
| parent | 968bc56e864dd1f1f189b6042ac62e3d4c37bb26 (diff) | |
| download | clutter-484672600b98ce1deb1c18592cb201567152ae79.tar.gz | |
gesture-action: avoid shadowing time() syscall function
https://bugzilla.gnome.org/show_bug.cgi?id=698668
| -rw-r--r-- | clutter/clutter-gesture-action.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clutter/clutter-gesture-action.c b/clutter/clutter-gesture-action.c index 751555a44..27eb1a597 100644 --- a/clutter/clutter-gesture-action.c +++ b/clutter/clutter-gesture-action.c @@ -291,7 +291,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; @@ -347,9 +347,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); @@ -384,8 +384,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); |