X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fhash%2Fhash.h;h=217068406af701b74257d4066c5bdf39d41f41e8;hp=189c9438c8dfdccd4ba12480b4afa808f2d7f248;hb=HEAD;hpb=532980dbdfb5dc2959fda2c0e887db17fe49aef0

diff --git a/ccan/hash/hash.h b/ccan/hash/hash.h
index 189c9438..21706840 100644
--- a/ccan/hash/hash.h
+++ b/ccan/hash/hash.h
@@ -1,8 +1,9 @@
+/* CC0 (Public domain) - see LICENSE file for details */
 #ifndef CCAN_HASH_H
 #define CCAN_HASH_H
+#include "config.h"
 #include <stdint.h>
 #include <stdlib.h>
-#include "config.h"
 #include <ccan/build_assert/build_assert.h>
 
 /* Stolen mostly from: lookup3.c, by Bob Jenkins, May 2006, Public Domain.
@@ -91,8 +92,8 @@
  *	}
  */
 #define hash_stable(p, num, base)					\
-	(EXPR_BUILD_ASSERT(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
-			   || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) +	\
+	(BUILD_ASSERT_OR_ZERO(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
+			      || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) + \
 	 sizeof(*(p)) == 8 ? hash_stable_64((p), (num), (base))		\
 	 : sizeof(*(p)) == 4 ? hash_stable_32((p), (num), (base))	\
 	 : sizeof(*(p)) == 2 ? hash_stable_16((p), (num), (base))	\
@@ -220,8 +221,8 @@ static inline uint32_t hash_string(const char *string)
  *	}
  */
 #define hash64_stable(p, num, base)					\
-	(EXPR_BUILD_ASSERT(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
-			   || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) +	\
+	(BUILD_ASSERT_OR_ZERO(sizeof(*(p)) == 8 || sizeof(*(p)) == 4	\
+			      || sizeof(*(p)) == 2 || sizeof(*(p)) == 1) + \
 	 sizeof(*(p)) == 8 ? hash64_stable_64((p), (num), (base))	\
 	 : sizeof(*(p)) == 4 ? hash64_stable_32((p), (num), (base))	\
 	 : sizeof(*(p)) == 2 ? hash64_stable_16((p), (num), (base))	\
@@ -237,8 +238,8 @@ static inline uint32_t hash_string(const char *string)
  * This is either hash() or hash64(), on 32/64 bit long machines.
  */
 #define hashl(p, num, base)						\
-	(EXPR_BUILD_ASSERT(sizeof(long) == sizeof(uint32_t)		\
-			   || sizeof(long) == sizeof(uint64_t)) +	\
+	(BUILD_ASSERT_OR_ZERO(sizeof(long) == sizeof(uint32_t)		\
+			      || sizeof(long) == sizeof(uint64_t)) +	\
 	(sizeof(long) == sizeof(uint64_t)				\
 	 ? hash64((p), (num), (base)) : hash((p), (num), (base))))
 
@@ -301,11 +302,11 @@ static inline uint32_t hash_pointer(const void *p, uint32_t base)
 	if (sizeof(p) % sizeof(uint32_t) == 0) {
 		/* This convoluted union is the right way of aliasing. */
 		union {
-			uint32_t u32[sizeof(p) / sizeof(uint32_t)];
+			uint32_t a[sizeof(p) / sizeof(uint32_t)];
 			const void *p;
 		} u;
 		u.p = p;
-		return hash_u32(u.u32, sizeof(p) / sizeof(uint32_t), base);
+		return hash_u32(u.a, sizeof(p) / sizeof(uint32_t), base);
 	} else
 		return hash(&p, 1, base);
 }