From 403e0597cd0cd4ba489614bf2bea72465ce899b9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 8 Apr 2002 18:50:41 +0000 Subject: Update. 2002-04-08 Ulrich Drepper * 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 * 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. --- include/libintl.h | 2 +- include/stdlib.h | 2 +- include/unistd.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/libintl.h b/include/libintl.h index a4d6148d8d..99f7787ba2 100644 --- a/include/libintl.h +++ b/include/libintl.h @@ -28,7 +28,7 @@ extern const char _libc_intl_domainname_internal[] attribute_hidden; # undef _ /* This is defined as an optimizing macro, so use it. */ -# if !defined NOT_IN_LIBC && defined SHARED +# if !defined NOT_IN_libc && defined SHARED # define _(msgid) \ __dcgettext_internal (_libc_intl_domainname_internal, (msgid), LC_MESSAGES) # else diff --git a/include/stdlib.h b/include/stdlib.h index 55437d4aae..110a78ca17 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -147,7 +147,7 @@ __strtoull_l (__const char * __restrict __nptr, char **__restrict __endptr, } -# ifndef NOT_IN_LIBC +# ifndef NOT_IN_libc # undef MB_CUR_MAX # define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX)) # endif diff --git a/include/unistd.h b/include/unistd.h index 8fd7088320..5cd4360c55 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -98,7 +98,7 @@ extern void *__sbrk (intptr_t __delta); and some functions contained in the C library ignore various environment variables that normally affect them. */ extern int __libc_enable_secure; -#ifdef _RTLD_LOCAL +#ifdef IS_IN_rtld /* XXX The #ifdef should go. */ extern int __libc_enable_secure_internal attribute_hidden; #endif -- cgit 1.4.1