jmap: use ccan/tcon and always be typesafe.

[ccan] / ccan / tcon / tcon.h

diff --git a/ccan/tcon/tcon.h b/ccan/tcon/tcon.h
index 5b38c7193406fa1ccae181dbfde21849ace70601..0f6981d97917009dc816519e1485daaee0d61a59 100644 (file)
--- a/ccan/tcon/tcon.h
+++ b/ccan/tcon/tcon.h
@@ -74,8 +74,10 @@
  */
 #if HAVE_TYPEOF
 #define tcon_cast(x, canary, expr) ((__typeof__((x)->_tcon[0].canary))(expr))
+#define tcon_cast_ptr(x, canary, expr) ((__typeof__(&(x)->_tcon[0].canary))(expr))
 #else
 #define tcon_cast(x, canary, expr) ((void *)(expr))
+#define tcon_cast_ptr(x, canary, expr) ((void *)(expr))
 #endif
 
 #endif /* CCAN_TCON_H */