From 701cfebbed907d5e9644228b3e1debbb0ca3e5f9 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 15 Dec 2010 11:56:50 +0000 Subject: [PATCH] * eina: some time compiler are really stupid... SVN revision: 55561 --- legacy/eina/src/include/eina_accessor.h | 2 +- legacy/eina/src/include/eina_iterator.h | 2 +- legacy/eina/src/lib/eina_hash.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/legacy/eina/src/include/eina_accessor.h b/legacy/eina/src/include/eina_accessor.h index 1d00d3261f..04345af33f 100644 --- a/legacy/eina/src/include/eina_accessor.h +++ b/legacy/eina/src/include/eina_accessor.h @@ -172,7 +172,7 @@ EAPI Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1) */ #define EINA_ACCESSOR_FOREACH(accessor, counter, data) \ for ((counter) = 0; \ - eina_accessor_data_get((accessor), (counter), (void **)&(data)); \ + eina_accessor_data_get((accessor), (counter), (void **)(void *)&(data)); \ (counter)++) /** diff --git a/legacy/eina/src/include/eina_iterator.h b/legacy/eina/src/include/eina_iterator.h index 93c0e2740d..56b1718047 100644 --- a/legacy/eina/src/include/eina_iterator.h +++ b/legacy/eina/src/include/eina_iterator.h @@ -167,7 +167,7 @@ EAPI Eina_Bool eina_iterator_unlock(Eina_Iterator *iterator) EINA_ARG_NONNULL(1) */ #define EINA_ITERATOR_FOREACH(itr, \ data) while (eina_iterator_next((itr), \ - (void **)&(data))) + (void **)(void *)&(data))) /** * @} diff --git a/legacy/eina/src/lib/eina_hash.c b/legacy/eina/src/lib/eina_hash.c index 7f9a044110..18633e7551 100644 --- a/legacy/eina/src/lib/eina_hash.c +++ b/legacy/eina/src/lib/eina_hash.c @@ -611,13 +611,13 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data) } else { - ok = eina_iterator_next(it->list, (void **)&it->hash_element); + ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element); if (!ok) { eina_iterator_free(it->list); it->list = NULL; - ok = eina_iterator_next(it->current, (void **)&it->hash_head); + ok = eina_iterator_next(it->current, (void **)(void*)&it->hash_head); if (!ok) { eina_iterator_free(it->current); @@ -627,7 +627,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data) else { it->list = eina_rbtree_iterator_prefix(it->hash_head->head); - ok = eina_iterator_next(it->list, (void **)&it->hash_element); + ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element); } } @@ -642,7 +642,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data) { it->current = eina_rbtree_iterator_prefix(it->hash->buckets[bucket]); - ok = eina_iterator_next(it->current, (void **)&it->hash_head); + ok = eina_iterator_next(it->current, (void **)(void*)&it->hash_head); if (ok) break; @@ -656,7 +656,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data) eina_iterator_free(it->list); it->list = eina_rbtree_iterator_prefix(it->hash_head->head); - ok = eina_iterator_next(it->list, (void **)&it->hash_element); + ok = eina_iterator_next(it->list, (void **)(void*)&it->hash_element); if (bucket == it->hash->size) ok = EINA_FALSE; }