[Emacs-diffs] master b65255e: Port better to platforms lacking aligned_alloc

[Paul Eggert]

branch: master
commit b65255ea20e02a6a0569e045f8f3a29b2410c1c2
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Port better to platforms lacking aligned_alloc
    
    Problem reported by Ken Brown (Bug#22522).
    * src/lisp.h (hybrid_aligned_alloc)
    [HYBRID_MALLOC && !HAVE_ALIGNED_ALLOC]: New decl.
---
 src/lisp.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/lisp.h b/src/lisp.h
index ef86c4f..54bce0f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3771,11 +3771,14 @@ extern void check_cons_list (void);
 INLINE void (check_cons_list) (void) { lisp_h_check_cons_list (); }
 #endif
 
-#if !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC && !defined 
SYSTEM_MALLOC
 /* Defined in gmalloc.c.  */
+#if !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC && !defined 
SYSTEM_MALLOC
 extern size_t __malloc_extra_blocks;
 extern void *aligned_alloc (size_t, size_t);
 #endif
+#if defined HYBRID_MALLOC && !defined HAVE_ALIGNED_ALLOC
+extern void *hybrid_aligned_alloc (size_t, size_t) ATTRIBUTE_MALLOC_SIZE ((2));
+#endif
 extern void malloc_enable_thread (void);
 
 #ifdef REL_ALLOC