X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fjmap%2Fjmap_type.h;h=e61ba10946d260083c96207217b4d61eda2f2179;hp=dbbb97bf28d3cc0109ebd8eb17ff37b4431dc43c;hb=09fde153ba7a68715dcad3b53cbbb8804c3d2356;hpb=daddafe53685b0b6f90a7746cbbd1a2e7df59216

diff --git a/ccan/jmap/jmap_type.h b/ccan/jmap/jmap_type.h
index dbbb97bf..e61ba109 100644
--- a/ccan/jmap/jmap_type.h
+++ b/ccan/jmap/jmap_type.h
@@ -264,8 +264,11 @@ static inline void jmap_##name##_putval(struct jmap_##name *map,	\
 static inline type **jmap_##name##_firstval(const struct jmap_##name *map, \
 					    itype **index)		\
 {									\
-	return (type **)jmap_firstval((const struct jmap *)map,		\
-				      (size_t *)index);			\
+	size_t idx;							\
+	type **ret;							\
+	ret = (type **)jmap_firstval((const struct jmap *)map, &idx);	\
+	*index = (void *)idx;						\
+	return ret;							\
 }									\
 static inline type **jmap_##name##_nextval(const struct jmap_##name *map, \
 					   itype **index)		\