summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--elf/dl-minimal.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7656ebe26f..b6f0652380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2007-01-24 Ulrich Drepper <drepper@redhat.com>
+ * elf/dl-minimal.c: Undefine _itoa first.
* stdio-common/_itoa.h: Define _itoa and _fitoa for 64-bit platforms.
* malloc/mtrace.c: Revert last change.
* posix/wordexp.c: Likewise.
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index 8e78709b5a..45524088e9 100644
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -1,5 +1,5 @@
/* Minimal replacements for basic facilities used in the dynamic linker.
- Copyright (C) 1995-1998,2000-2002,2004,2005,2006
+ Copyright (C) 1995-1998,2000-2002,2004-2006,2007
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -283,6 +283,7 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group)
}
+#undef _itoa
/* We always use _itoa instead of _itoa_word in ld.so since the former
also has to be present and it is never about speed when these
functions are used. */