summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/birdlib.h4
-rw-r--r--lib/mempool.c2
-rw-r--r--proto/bgp/attrs.c6
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/birdlib.h b/lib/birdlib.h
index 1a575bf..1a27e96 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 ba95323..bb6dcff 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)
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index ba3efec..7fb817a 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -327,7 +327,7 @@ bgp_new_bucket(struct bgp_proto *p, ea_list *new, unsigned hash)
{
struct bgp_bucket *b;
unsigned ea_size = sizeof(ea_list) + new->count * sizeof(eattr);
- unsigned ea_size_aligned = ALIGN(ea_size, CPU_STRUCT_ALIGN);
+ unsigned ea_size_aligned = BIRD_ALIGN(ea_size, CPU_STRUCT_ALIGN);
unsigned size = sizeof(struct bgp_bucket) + ea_size;
unsigned i;
byte *dest;
@@ -338,7 +338,7 @@ bgp_new_bucket(struct bgp_proto *p, ea_list *new, unsigned hash)
{
eattr *a = &new->attrs[i];
if (!(a->type & EAF_EMBEDDED))
- size += ALIGN(sizeof(struct adata) + a->u.ptr->length, CPU_STRUCT_ALIGN);
+ size += BIRD_ALIGN(sizeof(struct adata) + a->u.ptr->length, CPU_STRUCT_ALIGN);
}
/* Create the bucket and hash it */
@@ -364,7 +364,7 @@ bgp_new_bucket(struct bgp_proto *p, ea_list *new, unsigned hash)
struct adata *na = (struct adata *) dest;
memcpy(na, oa, sizeof(struct adata) + oa->length);
a->u.ptr = na;
- dest += ALIGN(sizeof(struct adata) + na->length, CPU_STRUCT_ALIGN);
+ dest += BIRD_ALIGN(sizeof(struct adata) + na->length, CPU_STRUCT_ALIGN);
}
}