about summary refs log tree commit diff
path: root/include
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 /include
parent4c93a54ca8c197ab73425db52351f110af795957 (diff)
downloadglibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar.gz
glibc-403e0597cd0cd4ba489614bf2bea72465ce899b9.tar.xz
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 'include')
-rw-r--r--include/libintl.h2
-rw-r--r--include/stdlib.h2
-rw-r--r--include/unistd.h2
3 files changed, 3 insertions, 3 deletions
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