From e84f5357ffa204e8166af540b3d4a1e9ea10f47b Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 11 Dec 2010 00:45:26 +0000 Subject: [PATCH] * make vc++ happy with ERR() * use uintptr_t where needed. Please someone check if the compilation is still good on linux (I'm on Windows), to see if a header must be included for uintptr_t or not. SVN revision: 55479 --- legacy/eina/src/lib/eina_magic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/legacy/eina/src/lib/eina_magic.c b/legacy/eina/src/lib/eina_magic.c index 9b96a070b7..b3ccca124c 100644 --- a/legacy/eina/src/lib/eina_magic.c +++ b/legacy/eina/src/lib/eina_magic.c @@ -104,10 +104,11 @@ _eina_magic_strings_alloc(void) { #ifdef _WIN32 ERR("could not realloc magic_strings from %Iu to %Iu buckets.", + _eina_magic_strings_allocated, size); #else ERR("could not realloc magic_strings from %zu to %zu buckets.", -#endif _eina_magic_strings_allocated, size); +#endif return NULL; } @@ -319,7 +320,7 @@ eina_magic_string_get(Eina_Magic magic) _eina_magic_strings_dirty = 0; } - ems = bsearch((void *)(long)magic, _eina_magic_strings, + ems = bsearch((void *)(uintptr_t)magic, _eina_magic_strings, _eina_magic_strings_count, sizeof(Eina_Magic_String), _eina_magic_strings_find_cmp); if (ems)