From 8114530a31e03aec4085f79971c2a3b9e940eae3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 17 Jul 2000 22:09:30 +0000 Subject: Update. 2000-07-17 Bruno Haible * iconv/gconv_open.c (__gconv_open): Initialize the __data field of struct __gconv_trans_data differently. Don't pass NULL to trans_init_fct. Simplify list append operation. 2000-07-14 Bruno Haible * intl/dcigettext.c (dcigettext): Call plural_eval on all platforms, not only those having tsearch. 2000-07-17 Ulrich Drepper * locale/langinfo.h: Add placeholder values in enum for removed LC_CTYPE entries. 2000-07-17 Jakub Jelinek * elf/dl-addr.c (_dl_addr): Keep searching in the _dl_loaded chain if the PHDR check fails. 2000-07-17 Mark Kettenis * nss/getent.c (print_hosts): Make sure we always print a space between numeric addresses and hostnames. 2000-07-17 Wolfram Gloger * malloc/malloc.c (chunk_alloc): Use mmap_chunk() only if allowed, i.e. if n_mmaps_max>0. 2000-07-16 Mark Kettenis * resolv/netdb.h (AI_V4MAPPED, AI_ALL, AI_ADDRCONFIG): Adjust values to remove possible clash with other AI_* constants. (AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST): Define as hexadecimal constants to stress the fact they're in fact bit flags. 2000-07-15 Mark Kettenis * nss/getXXent_r.c [NEED__RES]: Include . (SETFUNC_NAME, ENDFUNC_NAME, REENTRANT_GETNAME): Use res_ninit instead of res_init. --- malloc/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'malloc') diff --git a/malloc/malloc.c b/malloc/malloc.c index 8eed746..f2246f6 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2942,8 +2942,8 @@ chunk_alloc(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb; { #if HAVE_MMAP /* A last attempt: when we are out of address space in the arena, - try mmap anyway, disregarding n_mmaps_max. */ - if((victim = mmap_chunk(nb)) != 0) + try mmap anyway, as long as it is allowed at all. */ + if (n_mmaps_max > 0 && (victim = mmap_chunk(nb)) != 0) return victim; #endif return 0; /* propagate failure */ -- cgit v1.1