diff -r fb59270b1de3 -r 303dabadff1c ucx/map.h
--- a/ucx/map.h	Fri Oct 12 10:54:55 2012 +0200
+++ b/ucx/map.h	Fri Oct 12 12:08:34 2012 +0200
@@ -67,12 +67,18 @@
 void* ucx_map_get(UcxMap *map, UcxKey key);
 void* ucx_map_remove(UcxMap *map, UcxKey key);
 
-#define ucx_map_sstr_put(m, s, d) ucx_map_put(m, ucx_key(s.ptr, s.length), d)
-#define ucx_map_cstr_put(m, s, d) ucx_map_put(m, ucx_key(s, 1+strlen(s)), d)
-#define ucx_map_sstr_get(m, s) ucx_map_get(m, ucx_key(s.ptr, s.length))
-#define ucx_map_cstr_get(m, s) ucx_map_get(m, ucx_key(s, 1+strlen(s)))
-#define ucx_map_sstr_remove(m, s) ucx_map_remove(m, ucx_key(s.ptr, s.length))
-#define ucx_map_cstr_remove(m, s) ucx_map_remove(m, ucx_key(s, 1+strlen(s)))
+#define ucx_map_sstr_put(m, s, d) \
+    ucx_map_put(m, ucx_key((void*)s.ptr, s.length), d)
+#define ucx_map_cstr_put(m, s, d) \
+    ucx_map_put(m, ucx_key((void*)s, 1+strlen(s)), d)
+#define ucx_map_sstr_get(m, s) \
+    ucx_map_get(m, ucx_key((void*)s.ptr, s.length))
+#define ucx_map_cstr_get(m, s) \
+    ucx_map_get(m, ucx_key((void*)s, 1+strlen(s)))
+#define ucx_map_sstr_remove(m, s) \
+    ucx_map_remove(m, ucx_key((void*)s.ptr, s.length))
+#define ucx_map_cstr_remove(m, s) \
+    ucx_map_remove(m, ucx_key((void*)s, 1+strlen(s)))
 
 UcxKey ucx_key(void *data, size_t len);