diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/alloc.c b/src/alloc.c index 039b7285e39..b1d3f2e6511 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1123,17 +1123,12 @@ lisp_free (void *block) | |||
| 1123 | clang 3.3 anyway. */ | 1123 | clang 3.3 anyway. */ |
| 1124 | 1124 | ||
| 1125 | #if ! ADDRESS_SANITIZER | 1125 | #if ! ADDRESS_SANITIZER |
| 1126 | # if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC | 1126 | # if defined HYBRID_MALLOC |
| 1127 | # define USE_ALIGNED_ALLOC 1 | 1127 | # if defined HAVE_ALIGNED_ALLOC || defined HAVE_POSIX_MEMALIGN |
| 1128 | /* Defined in gmalloc.c. */ | ||
| 1129 | void *aligned_alloc (size_t, size_t); | ||
| 1130 | # elif defined HYBRID_MALLOC | ||
| 1131 | # if defined ALIGNED_ALLOC || defined HAVE_POSIX_MEMALIGN | ||
| 1132 | # define USE_ALIGNED_ALLOC 1 | 1128 | # define USE_ALIGNED_ALLOC 1 |
| 1133 | # define aligned_alloc hybrid_aligned_alloc | ||
| 1134 | /* Defined in gmalloc.c. */ | ||
| 1135 | void *aligned_alloc (size_t, size_t); | ||
| 1136 | # endif | 1129 | # endif |
| 1130 | # elif !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC | ||
| 1131 | # define USE_ALIGNED_ALLOC 1 | ||
| 1137 | # elif defined HAVE_ALIGNED_ALLOC | 1132 | # elif defined HAVE_ALIGNED_ALLOC |
| 1138 | # define USE_ALIGNED_ALLOC 1 | 1133 | # define USE_ALIGNED_ALLOC 1 |
| 1139 | # elif defined HAVE_POSIX_MEMALIGN | 1134 | # elif defined HAVE_POSIX_MEMALIGN |