summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-10-27 00:23:28 +0000
committerUlrich Drepper <drepper@redhat.com>2001-10-27 00:23:28 +0000
commitca6c73895da003ccea1b7e8ef2b32c98746812aa (patch)
tree4f888d36af9a7988c8f128bf94093bdd15c496f8 /malloc
parentd3640b91f7416080e4f16c93f7a59d6849ac6dc9 (diff)
downloadglibc-ca6c73895da003ccea1b7e8ef2b32c98746812aa.tar.gz
glibc-ca6c73895da003ccea1b7e8ef2b32c98746812aa.tar.xz
glibc-ca6c73895da003ccea1b7e8ef2b32c98746812aa.zip
Update.
2001-10-26  Ulrich Drepper  <drepper@redhat.com>

	* string/strxfrm.c [USE_IN_EXTENDED_LOCALE_MODEL]: Correctly get
	nrules value.

2001-10-24  H.J. Lu  <hjl@gnu.org>

	* sysdeps/generic/bits/dlfcn.h (DL_CALL_FCT): Cast to void *.
	Use __BEGIN_DECLS/__END_DECLS around prototypes.
	* sysdeps/mips/bits/dlfcn.h (DL_CALL_FCT): Likewise.

2001-10-21  Jim Meyering  <meyering@lucent.com>

	* malloc/obstack.c (_): Honor the setting of ENABLE_NLS.  Otherwise,
	this code would end up calling gettext even in packages built
	with --disable-nls.
	* posix/getopt.c (_): Likewise.
	* posix/regex.c (_): Likewise.

2001-10-26  Ulrich Drepper  <drepper@redhat.com>

	* resolv/gethnamaddr.c (gethostbyaddr): Use ip6.addr for reverse
	lookup not ip6.int.
	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr_r): Likewise.
	Reported by Martin.v.Loewis@t-online.de [PR libc/2598].

2001-10-19  Jakub Jelinek  <jakub@redhat.com>

	* misc/sys/cdefs.h (__attribute_used__): Define.
	* elf/rtld.c (_dl_start): Add __attribute_used__.
	* elf/dl-runtime.c (fixup, profile_fixup): Likewise.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/obstack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/obstack.c b/malloc/obstack.c
index 7b1206c13f..0244da3839 100644
--- a/malloc/obstack.c
+++ b/malloc/obstack.c
@@ -459,7 +459,7 @@ _obstack_memory_used (h)
 
 /* Define the error handler.  */
 # ifndef _
-#  if defined HAVE_LIBINTL_H || defined _LIBC
+#  if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #   include <libintl.h>
 #   ifndef _
 #    define _(Str) gettext (Str)