From 27dec5264facbd13fdbe37980dd1d70045f60b3f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 14 Jun 2016 13:39:30 -0400 Subject: [PATCH] * src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23764) --- src/alloc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/alloc.c b/src/alloc.c index 4c9cbf1072..45234474a2 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -468,6 +468,11 @@ static void *pure_alloc (size_t, int); ? ((x) + (y) - 1) - ((x) + (y) - 1) % (y) \ : ((x) + (y) - 1) & ~ ((y) - 1)) +/* Bug#23764 */ +#ifdef ALIGN +# undef ALIGN +#endif + /* Return PTR rounded up to the next multiple of ALIGNMENT. */ static void * -- 2.39.2