diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-06-14 13:39:30 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-06-14 13:39:30 -0400 |
| commit | 27dec5264facbd13fdbe37980dd1d70045f60b3f (patch) | |
| tree | 1ca548230b8de0f4518b1b0465c95d262dec41d9 /src | |
| parent | f5261917191336d052ad8586b2d9fd62ba46c3c4 (diff) | |
| download | emacs-27dec5264facbd13fdbe37980dd1d70045f60b3f.tar.gz | |
* src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23764)
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc.c | 5 |
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); ? ((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 * |