From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Thu, 12 May 2016 19:47:29 +0000 (+0200)
Subject: Make int-new compilable again
X-Git-Tag: v2.0.0-pre0~37^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=659f80f262a83d600d5f095fb8a03e912d3fbe64;p=thirdparty%2Fbird.git

Make int-new compilable again
---

diff --git a/lib/hash.h b/lib/hash.h
index b86a2eb13..04a16a7e7 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -178,7 +178,7 @@
 
 #define HASH_WALK_FILTER_END } while (0)
 
-typedef mem_hash_t  u64;
+typedef u64 mem_hash_t;
 
 static inline void
 mem_hash_init(mem_hash_t *h)
@@ -199,7 +199,7 @@ mem_hash_mix(mem_hash_t *h, void *p, int s)
 static inline uint
 mem_hash_value(mem_hash_t *h)
 {
-  return ((value >> 32) ^ (value & 0xffffffff));
+  return ((*h >> 32) ^ (*h & 0xffffffff));
 }
 
 static inline uint
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index edd9ebf5d..5041ab9f5 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -948,7 +948,7 @@ rta_hash(rta *a)
 {
   mem_hash_t h;
   mem_hash_init(&h);
-#define MIX(f) mem_hash_mix(&h, &(rta->f), sizeof(rta->f));
+#define MIX(f) mem_hash_mix(&h, &(a->f), sizeof(a->f));
   MIX(src);
   MIX(hostentry);
   MIX(iface);