bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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
This commit is contained in:
Vincent Torri 2010-12-11 00:45:26 +00:00
parent f39a7b7fcd
commit e84f5357ff
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/eina/src/lib/eina_magic.c
View File

@ -104,10 +104,11 @@ _eina_magic_strings_alloc(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
ERR("could not realloc magic_strings from %Iu to %Iu buckets.", ERR("could not realloc magic_strings from %Iu to %Iu buckets.",
_eina_magic_strings_allocated, size);
#else #else
ERR("could not realloc magic_strings from %zu to %zu buckets.", ERR("could not realloc magic_strings from %zu to %zu buckets.",
#endif
_eina_magic_strings_allocated, size); _eina_magic_strings_allocated, size);
#endif
return NULL; return NULL;
} }
@ -319,7 +320,7 @@ eina_magic_string_get(Eina_Magic magic)
_eina_magic_strings_dirty = 0; _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_count, sizeof(Eina_Magic_String),
_eina_magic_strings_find_cmp); _eina_magic_strings_find_cmp);
if (ems) if (ems)