diff options
| author | Po Lu | 2023-03-05 08:09:03 +0800 |
|---|---|---|
| committer | Po Lu | 2023-03-05 08:09:03 +0800 |
| commit | 1f4818d3e31f9870e1b0706fe22274d433ca32ea (patch) | |
| tree | 13e4c8e6bd19ff3bae50f3d6d16001ec3c4b2a6f /src/alloc.c | |
| parent | b5bf4dc5b5186324f53c5d9ef2a4225224338950 (diff) | |
| parent | 4b3ccf3092eaf5573b0f4968ee9a4515d04fd061 (diff) | |
| download | emacs-1f4818d3e31f9870e1b0706fe22274d433ca32ea.tar.gz emacs-1f4818d3e31f9870e1b0706fe22274d433ca32ea.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index be80410176d..c64c03e1706 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -1087,7 +1087,11 @@ lisp_free (void *block) | |||
| 1087 | BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ | 1087 | BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */ |
| 1088 | 1088 | ||
| 1089 | /* Byte alignment of storage blocks. */ | 1089 | /* Byte alignment of storage blocks. */ |
| 1090 | #define BLOCK_ALIGN (1 << 15) | 1090 | #ifdef HAVE_UNEXEC |
| 1091 | # define BLOCK_ALIGN (1 << 10) | ||
| 1092 | #else /* !HAVE_UNEXEC */ | ||
| 1093 | # define BLOCK_ALIGN (1 << 15) | ||
| 1094 | #endif | ||
| 1091 | verify (POWER_OF_2 (BLOCK_ALIGN)); | 1095 | verify (POWER_OF_2 (BLOCK_ALIGN)); |
| 1092 | 1096 | ||
| 1093 | /* Use aligned_alloc if it or a simple substitute is available. | 1097 | /* Use aligned_alloc if it or a simple substitute is available. |