aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2016-06-14 13:39:30 -0400
committerGlenn Morris2016-06-14 13:39:30 -0400
commit27dec5264facbd13fdbe37980dd1d70045f60b3f (patch)
tree1ca548230b8de0f4518b1b0465c95d262dec41d9 /src
parentf5261917191336d052ad8586b2d9fd62ba46c3c4 (diff)
downloademacs-27dec5264facbd13fdbe37980dd1d70045f60b3f.tar.gz
emacs-27dec5264facbd13fdbe37980dd1d70045f60b3f.zip
* src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23764)
Diffstat (limited to 'src')
-rw-r--r--src/alloc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 4c9cbf10724..45234474a27 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -468,6 +468,11 @@ static void *pure_alloc (size_t, int);
468 ? ((x) + (y) - 1) - ((x) + (y) - 1) % (y) \ 468 ? ((x) + (y) - 1) - ((x) + (y) - 1) % (y) \
469 : ((x) + (y) - 1) & ~ ((y) - 1)) 469 : ((x) + (y) - 1) & ~ ((y) - 1))
470 470
471/* Bug#23764 */
472#ifdef ALIGN
473# undef ALIGN
474#endif
475
471/* Return PTR rounded up to the next multiple of ALIGNMENT. */ 476/* Return PTR rounded up to the next multiple of ALIGNMENT. */
472 477
473static void * 478static void *