diff --git a/ccan/README b/ccan/README index ad5b8d61f..17f9a28d1 100644 --- a/ccan/README +++ b/ccan/README @@ -1,3 +1,3 @@ CCAN imported from http://ccodearchive.net. -CCAN version: init-2548-gab87e56b +CCAN version: init-2549-gba79e21b diff --git a/ccan/ccan/tcon/tcon.h b/ccan/ccan/tcon/tcon.h index e0f84b383..df3aac88b 100644 --- a/ccan/ccan/tcon/tcon.h +++ b/ccan/ccan/tcon/tcon.h @@ -147,8 +147,7 @@ * It evaluates to @x so you can chain it. */ #define tcon_check_ptr(x, canary, expr) \ - (sizeof(&(x)->_tcon[0].canary == (expr)) ? (x) : (x)) - + (sizeof((expr) ? (expr) : &(x)->_tcon[0].canary) ? (x) : (x)) /** * tcon_type - the type within a container (or void *)