* 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.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@55479 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/eina_magic.c b/src/lib/eina_magic.c
index 9b96a07..b3ccca1 100644 (file)
--- a/src/lib/eina_magic.c
+++ b/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)