From: Glenn Morris <rgm@gnu.org>
Date: Tue, 14 Jun 2016 17:39:30 +0000 (-0400)
Subject: * src/alloc.c (ALIGN): Avoid error on DragonFly BSD.  (Bug#23764)
X-Git-Tag: emacs-25.1-rc1~88
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=27dec52;p=emacs.git

* src/alloc.c (ALIGN): Avoid error on DragonFly BSD.  (Bug#23764)
---

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);
 		       ? ((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 *