From 659f80f262a83d600d5f095fb8a03e912d3fbe64 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Thu, 12 May 2016 21:47:29 +0200 Subject: Make int-new compilable again --- lib/hash.h | 4 ++-- nest/rt-attr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/hash.h b/lib/hash.h index b86a2eb1..04a16a7e 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 edd9ebf5..5041ab9f 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); -- cgit v1.2.3