projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f526191
)
* src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23764)
author
Glenn Morris
<rgm@gnu.org>
Tue, 14 Jun 2016 17:39:30 +0000
(13:39 -0400)
committer
Glenn Morris
<rgm@gnu.org>
Tue, 14 Jun 2016 17:39:30 +0000
(13:39 -0400)
src/alloc.c
patch
|
blob
|
history
diff --git
a/src/alloc.c
b/src/alloc.c
index 4c9cbf1072470d48ea1027addad256ae3d31ea39..45234474a274bea3d96bed2738e61963afc30ab9 100644
(file)
--- 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 *