summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-02-03 00:37:44 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-02-03 00:38:38 -0800
commit5fcd89f52ec6b8b5b24641d20b9907998c4fa0b9 (patch)
tree66bbb463f01bc337d905d812e4e56115fb657279 /src
parentaca31e3815b9bd9c696cf0c74cc4a80ad7e35ec9 (diff)
Port aligned_alloc decl to Cygwin.
Problem reported by Ken Brown (Bug#22522#38). * configure.ac (aligned_alloc): Check for decl too. * src/lisp.h (aligned_alloc): Declare if not already declared.
Diffstat (limited to 'src')
-rw-r--r--src/lisp.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 54bce0fab0..a99002bddd 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3774,10 +3774,9 @@ INLINE void (check_cons_list) (void) { lisp_h_check_cons_list (); }
/* 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));
+#ifndef HAVE_DECL_ALIGNED_ALLOC
+extern void *aligned_alloc (size_t, size_t) ATTRIBUTE_MALLOC_SIZE ((2));
#endif
extern void malloc_enable_thread (void);