Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make int-new compilable again

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2016-05-12 21:47:29 +02:00
parent 776d6b2c05
commit 659f80f262
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/hash.h
View file

@ -178,7 +178,7 @@
#define HASH_WALK_FILTER_END } while (0) #define HASH_WALK_FILTER_END } while (0)
typedef mem_hash_t u64; typedef u64 mem_hash_t;
static inline void static inline void
mem_hash_init(mem_hash_t *h) 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 static inline uint
mem_hash_value(mem_hash_t *h) mem_hash_value(mem_hash_t *h)
{ {
return ((value >> 32) ^ (value & 0xffffffff)); return ((*h >> 32) ^ (*h & 0xffffffff));
} }
static inline uint static inline uint

2
nest/rt-attr.c
View file

@ -948,7 +948,7 @@ rta_hash(rta *a)
{ {
mem_hash_t h; mem_hash_t h;
mem_hash_init(&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(src);
MIX(hostentry); MIX(hostentry);
MIX(iface); MIX(iface);