aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-08 18:50:41 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-08 18:50:41 +0000
commit403e0597cd0cd4ba489614bf2bea72465ce899b9 (patch)
tree4bba91733fc5e21a76657795f10fc43080ac8bdf /stdio-common
parent4c93a54ca8c197ab73425db52351f110af795957 (diff)
downloadglibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar
glibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar.gz
glibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar.bz2
glibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.zip
Update.
2002-04-08 Ulrich Drepper <drepper@redhat.com> * cppflags-iterator.mk (cpp-srcs-left): Define NOT_IN_libc instead of NOT_IN_LIBC. * include/libintl.h: Test for NOT_IN_libc not NOT_IN_LIBC. * include/stdlib.h: Likewise. 2002-04-08 Jakub Jelinek <jakub@redhat.com> * elf/Makefile (CFLAGS-.os): Define NOT_IN_libc and IS_IN_rtld instead of _RTLD_LOCAL. * elf/dl-dst.h: Use IS_IN_rtld instead of _RTLD_LOCAL. * include/unistd.h: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * stdio-common/_itoa.h (_itoa_word): Only use internal digit arrays if in libc or ld.so. * include/stdlib.h: For libc itself replace MB_CUR_MAX definition with one accessing the locale data structures directly. * stdio-common/printf-prs.c: Include localeinfo.h for new MB_CUR_MAX definition.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/_itoa.h8
-rw-r--r--stdio-common/printf-prs.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/stdio-common/_itoa.h b/stdio-common/_itoa.h
index 42bc3400fa..6249adca91 100644
--- a/stdio-common/_itoa.h
+++ b/stdio-common/_itoa.h
@@ -39,8 +39,14 @@ _itoa_word (unsigned long value, char *buflim,
unsigned int base, int upper_case)
{
const char *digits = (upper_case
+#if !defined NOT_IN_libc || defined IS_IN_rtld
? INTUSE(_itoa_upper_digits)
- : INTUSE(_itoa_lower_digits));
+ : INTUSE(_itoa_lower_digits)
+#else
+ ? _itoa_upper_digits
+ : _itoa_lower_digits
+#endif
+ );
switch (base)
{
diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index f0cd75b928..ecbb47d41c 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -23,6 +23,8 @@
#include <wchar.h>
#include <sys/param.h>
+#include "../locale/localeinfo.h"
+
#ifndef COMPILE_WPRINTF
# define CHAR_T char
# define UCHAR_T unsigned char