[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android 1f4818d3e31 1/5: Merge remote-tracking branch 'origin/ma
|
From: |
Po Lu |
|
Subject: |
feature/android 1f4818d3e31 1/5: Merge remote-tracking branch 'origin/master' into feature/android |
|
Date: |
Sat, 4 Mar 2023 21:52:09 -0500 (EST) |
branch: feature/android
commit 1f4818d3e31f9870e1b0706fe22274d433ca32ea
Merge: b5bf4dc5b51 4b3ccf3092e
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge remote-tracking branch 'origin/master' into feature/android
---
src/alloc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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)
BLOCK_BYTES and guarantees they are aligned on a BLOCK_ALIGN boundary. */
/* Byte alignment of storage blocks. */
-#define BLOCK_ALIGN (1 << 15)
+#ifdef HAVE_UNEXEC
+# define BLOCK_ALIGN (1 << 10)
+#else /* !HAVE_UNEXEC */
+# define BLOCK_ALIGN (1 << 15)
+#endif
verify (POWER_OF_2 (BLOCK_ALIGN));
/* Use aligned_alloc if it or a simple substitute is available.