diff --git a/configure.ac b/configure.ac index d397e8fa7e1..5579342c4e5 100644 --- a/configure.ac +++ b/configure.ac @@ -2218,7 +2218,7 @@ test "$CANNOT_DUMP" = yes || case "$opsys" in ## darwin ld insists on the use of malloc routines in the System framework. darwin | mingw32 | nacl | sol2-10) ;; - cygwin | qnxto) + cygwin | qnxto | freebsd) hybrid_malloc=yes system_malloc= ;; *) test "$ac_cv_func_sbrk" = yes && system_malloc=$emacs_cv_sanitize_address;; diff --git a/src/gmalloc.c b/src/gmalloc.c index 2bda95ebd3d..a17d39c1eeb 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -1502,17 +1502,18 @@ extern void *__sbrk (ptrdiff_t increment); static void * gdefault_morecore (ptrdiff_t increment) { - void *result; #ifdef HYBRID_MALLOC if (!DUMPED) { return bss_sbrk (increment); } #endif - result = (void *) __sbrk (increment); - if (result == (void *) -1) - return NULL; - return result; +#ifdef HAVE_SBRK + void *result = (void *) __sbrk (increment); + if (result != (void *) -1) + return result; +#endif + return NULL; } void *(*__morecore) (ptrdiff_t) = gdefault_morecore;