X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcast%2Fcast.h;h=2fa96445b338f6b6b341b3f2aad122963e91054e;hp=f3bb445d0f7c145158c2c67bed05cdbb8059d61b;hb=3f4e83d8ac847d6bf0c20e88cdbca535e842a97b;hpb=a1d048552e7c9cbd07092cefb87204563a807608

diff --git a/ccan/cast/cast.h b/ccan/cast/cast.h
index f3bb445d..2fa96445 100644
--- a/ccan/cast/cast.h
+++ b/ccan/cast/cast.h
@@ -14,7 +14,7 @@
  */
 #define cast_signed(type, expr)						\
 	((type)(expr)							\
-	 + EXPR_BUILD_ASSERT(cast_sign_compatible(type, (expr))))
+	 + BUILD_ASSERT_OR_ZERO(cast_sign_compatible(type, (expr))))
 
 /**
  * cast_const - remove a const qualifier from a pointer.
@@ -39,7 +39,7 @@
  */
 #define cast_const(type, expr)					\
 	((type)(expr)						\
-	 + EXPR_BUILD_ASSERT(cast_const_compat1((expr), type)))
+	 + BUILD_ASSERT_OR_ZERO(cast_const_compat1((expr), type)))
 
 /**
  * cast_const2 - remove a const qualifier from a pointer to a pointer.
@@ -51,7 +51,7 @@
  */
 #define cast_const2(type, expr)					\
 	((type)(expr)						\
-	 + EXPR_BUILD_ASSERT(cast_const_compat2((expr), type)))
+	 + BUILD_ASSERT_OR_ZERO(cast_const_compat2((expr), type)))
 
 /**
  * cast_const3 - remove a const from a pointer to a pointer to a pointer..
@@ -63,7 +63,7 @@
  */
 #define cast_const3(type, expr)					\
 	((type)(expr)						\
-	 + EXPR_BUILD_ASSERT(cast_const_compat3((expr), type)))
+	 + BUILD_ASSERT_OR_ZERO(cast_const_compat3((expr), type)))
 
 
 /**