Merge from origin/emacs-25

[gnu-emacs] / src / alloc.c

diff --git a/src/alloc.c b/src/alloc.c
index 3feed51b1e95e53700f2c344d8db4fb530596c1d..8173615992f26425d775a7a0ed8616e955dfddc4 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -486,6 +486,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 *