diff options
| author | Eli Zaretskii | 2017-10-28 19:39:48 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-10-28 19:39:48 +0300 |
| commit | 00c3c6d88d28c639626c5bbb43901775d5a13314 (patch) | |
| tree | dc26ee06cf74ddc0aec398be15a488d9dc1dffd1 /src/alloc.c | |
| parent | a8e67410662e653e60e8dcc7aaf27042492afee8 (diff) | |
| download | emacs-00c3c6d88d28c639626c5bbb43901775d5a13314.tar.gz emacs-00c3c6d88d28c639626c5bbb43901775d5a13314.zip | |
Avoid segfaults in 64-bit Windows builds
* src/lisp.h (COMMON_MULTIPLE): Move here from alloc.c.
* src/thread.c (THREAD_ALIGNMENT): New macro.
(main_thread): Use THREAD_ALIGNMENT to align propertly. (Bug#29040)
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/alloc.c b/src/alloc.c index da0c3ad4b3e..d9d74856799 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -621,12 +621,6 @@ buffer_memory_full (ptrdiff_t nbytes) | |||
| 621 | #endif | 621 | #endif |
| 622 | } | 622 | } |
| 623 | 623 | ||
| 624 | /* A common multiple of the positive integers A and B. Ideally this | ||
| 625 | would be the least common multiple, but there's no way to do that | ||
| 626 | as a constant expression in C, so do the best that we can easily do. */ | ||
| 627 | #define COMMON_MULTIPLE(a, b) \ | ||
| 628 | ((a) % (b) == 0 ? (a) : (b) % (a) == 0 ? (b) : (a) * (b)) | ||
| 629 | |||
| 630 | #ifndef XMALLOC_OVERRUN_CHECK | 624 | #ifndef XMALLOC_OVERRUN_CHECK |
| 631 | #define XMALLOC_OVERRUN_CHECK_OVERHEAD 0 | 625 | #define XMALLOC_OVERRUN_CHECK_OVERHEAD 0 |
| 632 | #else | 626 | #else |