aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-02-02 09:28:52 -0800
committerPaul Eggert2016-02-02 09:30:08 -0800
commitb65255ea20e02a6a0569e045f8f3a29b2410c1c2 (patch)
treeb14439806331f0ccf6de1043274c35a830f815f5 /src
parent39d8cac38b1668b3dc12dd5a2cfa35ce57adbac9 (diff)
downloademacs-b65255ea20e02a6a0569e045f8f3a29b2410c1c2.tar.gz
emacs-b65255ea20e02a6a0569e045f8f3a29b2410c1c2.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lisp.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index ef86c4fc958..54bce0fab0c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3771,11 +3771,14 @@ extern void check_cons_list (void);
3771INLINE void (check_cons_list) (void) { lisp_h_check_cons_list (); } 3771INLINE void (check_cons_list) (void) { lisp_h_check_cons_list (); }
3772#endif 3772#endif
3773 3773
3774#if !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC && !defined SYSTEM_MALLOC
3775/* Defined in gmalloc.c. */ 3774/* Defined in gmalloc.c. */
3775#if !defined DOUG_LEA_MALLOC && !defined HYBRID_MALLOC && !defined SYSTEM_MALLOC
3776extern size_t __malloc_extra_blocks; 3776extern size_t __malloc_extra_blocks;
3777extern void *aligned_alloc (size_t, size_t); 3777extern void *aligned_alloc (size_t, size_t);
3778#endif 3778#endif
3779#if defined HYBRID_MALLOC && !defined HAVE_ALIGNED_ALLOC
3780extern void *hybrid_aligned_alloc (size_t, size_t) ATTRIBUTE_MALLOC_SIZE ((2));
3781#endif
3779extern void malloc_enable_thread (void); 3782extern void malloc_enable_thread (void);
3780 3783
3781#ifdef REL_ALLOC 3784#ifdef REL_ALLOC