brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More ISO C90 warning fixes in Clutter

Browse Source 
This time, in Clutter core.

The ObjC standard library provides a type called 'id', which obviously
requires any library to either drop the useful shadowed variable warning
or stop using 'id' as a variable name.

Yes, it's almost unbearably stupid. Well, at least it's not 'index' in
string.h, or 'y2' in math.h.
This commit is contained in:
Emmanuele Bassi
2011-02-15 11:50:26 +00:00
parent 54a4511247
commit 5c398c18ad
16 changed files with 144 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-timeout-pool.c
View File

@ -463,9 +463,9 @@ clutter_timeout_pool_add (ClutterTimeoutPool *pool,
/**
* clutter_timeout_pool_remove:
* @pool: a #ClutterTimeoutPool
* @id: the id of the timeout to remove
* @id_: the id of the timeout to remove
*
* Removes a timeout function with @id from the timeout pool. The id
* Removes a timeout function with @id_ from the timeout pool. The id
* is the same returned when adding a function to the timeout pool with
* clutter_timeout_pool_add().
*
@ -475,18 +475,18 @@ clutter_timeout_pool_add (ClutterTimeoutPool *pool,
*/
void
clutter_timeout_pool_remove (ClutterTimeoutPool *pool,
guint id)
guint id_)
{
GList *l;
if ((l = g_list_find_custom (pool->timeouts, GUINT_TO_POINTER (id),
if ((l = g_list_find_custom (pool->timeouts, GUINT_TO_POINTER (id_),
clutter_timeout_find_by_id)))
{
clutter_timeout_unref (l->data);
pool->timeouts = g_list_delete_link (pool->timeouts, l);
}
else if ((l = g_list_find_custom (pool->dispatched_timeouts,
GUINT_TO_POINTER (id),
GUINT_TO_POINTER (id_),
clutter_timeout_find_by_id)))
{
clutter_timeout_unref (l->data);