[Emacs-diffs] emacs-25 27dec52: * src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23764)

[Glenn Morris]

branch: emacs-25
commit 27dec5264facbd13fdbe37980dd1d70045f60b3f
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * 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 4c9cbf1..4523447 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 *