From f4828d35f55dd050f3538d755579f9aefd458b35 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 23 Dec 2014 12:32:00 -0500 Subject: [PATCH] Bug 1115078 - Unbreak MOZ_JEMALLOC3 build on FreeBSD after bug 899126. r=glandium --- configure.in | 2 ++ memory/build/mozjemalloc_compat.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 4edf7c532fb5..69acd4fc4319 100644 --- a/configure.in +++ b/configure.in @@ -3416,6 +3416,8 @@ for file in $MALLOC_HEADERS; do fi done +MOZ_CHECK_HEADERS(alloca.h) + AC_CHECK_FUNCS(strndup posix_memalign memalign) AC_CHECK_FUNCS(malloc_usable_size) diff --git a/memory/build/mozjemalloc_compat.c b/memory/build/mozjemalloc_compat.c index 91a9a2463945..e1585e27f1f6 100644 --- a/memory/build/mozjemalloc_compat.c +++ b/memory/build/mozjemalloc_compat.c @@ -10,7 +10,6 @@ #include "mozmemory_wrap.h" #include "jemalloc_types.h" -#include "jemalloc/internal/jemalloc_internal_defs.h" // for JEMALLOC_HAS_ALLOCA_H #include "mozilla/Types.h" #include @@ -69,7 +68,7 @@ je_(nallocx)(size_t size, int flags); # include # define alloca _alloca # else -# ifdef JEMALLOC_HAS_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # include