1.1 --- a/ucx/map.h Fri Oct 12 10:54:55 2012 +0200 1.2 +++ b/ucx/map.h Fri Oct 12 12:08:34 2012 +0200 1.3 @@ -67,12 +67,18 @@ 1.4 void* ucx_map_get(UcxMap *map, UcxKey key); 1.5 void* ucx_map_remove(UcxMap *map, UcxKey key); 1.6 1.7 -#define ucx_map_sstr_put(m, s, d) ucx_map_put(m, ucx_key(s.ptr, s.length), d) 1.8 -#define ucx_map_cstr_put(m, s, d) ucx_map_put(m, ucx_key(s, 1+strlen(s)), d) 1.9 -#define ucx_map_sstr_get(m, s) ucx_map_get(m, ucx_key(s.ptr, s.length)) 1.10 -#define ucx_map_cstr_get(m, s) ucx_map_get(m, ucx_key(s, 1+strlen(s))) 1.11 -#define ucx_map_sstr_remove(m, s) ucx_map_remove(m, ucx_key(s.ptr, s.length)) 1.12 -#define ucx_map_cstr_remove(m, s) ucx_map_remove(m, ucx_key(s, 1+strlen(s))) 1.13 +#define ucx_map_sstr_put(m, s, d) \ 1.14 + ucx_map_put(m, ucx_key((void*)s.ptr, s.length), d) 1.15 +#define ucx_map_cstr_put(m, s, d) \ 1.16 + ucx_map_put(m, ucx_key((void*)s, 1+strlen(s)), d) 1.17 +#define ucx_map_sstr_get(m, s) \ 1.18 + ucx_map_get(m, ucx_key((void*)s.ptr, s.length)) 1.19 +#define ucx_map_cstr_get(m, s) \ 1.20 + ucx_map_get(m, ucx_key((void*)s, 1+strlen(s))) 1.21 +#define ucx_map_sstr_remove(m, s) \ 1.22 + ucx_map_remove(m, ucx_key((void*)s.ptr, s.length)) 1.23 +#define ucx_map_cstr_remove(m, s) \ 1.24 + ucx_map_remove(m, ucx_key((void*)s, 1+strlen(s))) 1.25 1.26 UcxKey ucx_key(void *data, size_t len); 1.27