X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fhtable%2Fhtable.h;fp=ccan%2Fhtable%2Fhtable.h;h=eac57e37a326612226f6cd7907c04bcbc589c360;hb=5971ec743ffa28a0eaae65929475226c703678b9;hp=358b74280867c8694fd90ce11689091fd57055fd;hpb=0f144bfe0ca3cc06564e19a7f3ea40177d1a3c2c;p=ccan

diff --git a/ccan/htable/htable.h b/ccan/htable/htable.h
index 358b7428..eac57e37 100644
--- a/ccan/htable/htable.h
+++ b/ccan/htable/htable.h
@@ -22,12 +22,12 @@
  * supply inline functions.
  */
 struct htable {
-	/* These are the bits which are the same in all pointers. */
-	uintptr_t common_bits, common_mask;
 	size_t (*rehash)(const void *elem, void *priv);
 	void *priv;
 	unsigned int bits, perfect_bitnum;
 	size_t elems, deleted;
+	/* These are the bits which are the same in all pointers. */
+	uintptr_t common_mask, common_bits;
 	uintptr_t *table;
 };
 
@@ -49,7 +49,7 @@ struct htable {
  *	static struct htable ht = HTABLE_INITIALIZER(ht, rehash, NULL);
  */
 #define HTABLE_INITIALIZER(name, rehash, priv)				\
-	{ 0, -1, rehash, priv, 0, 0, 0, 0, &name.common_bits }
+	{ rehash, priv, 0, 0, 0, 0, -1, 0, &name.common_bits }
 
 /**
  * htable_init - initialize an empty hash table.