diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/birdlib.h | 4 | ||||
| -rw-r--r-- | lib/mempool.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/birdlib.h b/lib/birdlib.h index 1a575bf8..1a27e969 100644 --- a/lib/birdlib.h +++ b/lib/birdlib.h @@ -13,9 +13,7 @@ #define OFFSETOF(s, i) ((unsigned int)&((s *)0)->i) #define SKIP_BACK(s, i, p) ((s *)((char *)p - OFFSETOF(s, i))) -#ifndef ALIGN -#define ALIGN(s, a) (((s)+a-1)&~(a-1)) -#endif +#define BIRD_ALIGN(s, a) (((s)+a-1)&~(a-1)) /* Utility macros */ diff --git a/lib/mempool.c b/lib/mempool.c index ba95323c..bb6dcff3 100644 --- a/lib/mempool.c +++ b/lib/mempool.c @@ -90,7 +90,7 @@ linpool void * lp_alloc(linpool *m, unsigned size) { - byte *a = (byte *) ALIGN((unsigned long) m->ptr, CPU_STRUCT_ALIGN); + byte *a = (byte *) BIRD_ALIGN((unsigned long) m->ptr, CPU_STRUCT_ALIGN); byte *e = a + size; if (e <= m->end) |