From 5be8418cb0856aff4de059802570eb12d558c91f Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 29 May 2012 23:55:13 +0200 Subject: Remove use of INTDEF/INTUSE in stdio-common --- sysdeps/generic/_itoa.h | 16 ++++++---------- sysdeps/gnu/siglist.c | 5 ++--- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/generic/_itoa.h b/sysdeps/generic/_itoa.h index 0a670431e4..2ab401d012 100644 --- a/sysdeps/generic/_itoa.h +++ b/sysdeps/generic/_itoa.h @@ -1,5 +1,5 @@ /* Internal function for converting integers to ASCII. - Copyright (C) 1994-1999,2002,2003,2007 Free Software Foundation, Inc. + Copyright (C) 1994-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,9 +45,11 @@ extern char *_itoa (unsigned long long int value, char *buflim, unsigned int base, int upper_case); extern const char _itoa_upper_digits[]; -extern const char _itoa_upper_digits_internal[] attribute_hidden; extern const char _itoa_lower_digits[]; -extern const char _itoa_lower_digits_internal[] attribute_hidden; +#if !defined NOT_IN_libc || defined IS_IN_rtld +hidden_proto (_itoa_upper_digits) +hidden_proto (_itoa_lower_digits) +#endif #ifndef NOT_IN_libc extern char *_itoa_word (_ITOA_WORD_TYPE value, char *buflim, @@ -58,14 +60,8 @@ _itoa_word (_ITOA_WORD_TYPE value, char *buflim, unsigned int base, int upper_case) { const char *digits = (upper_case -# if defined IS_IN_rtld - ? INTUSE(_itoa_upper_digits) - : INTUSE(_itoa_lower_digits) -# else ? _itoa_upper_digits - : _itoa_lower_digits -# endif - ); + : _itoa_lower_digits); switch (base) { diff --git a/sysdeps/gnu/siglist.c b/sysdeps/gnu/siglist.c index 61a0b827f5..1a7e38df09 100644 --- a/sysdeps/gnu/siglist.c +++ b/sysdeps/gnu/siglist.c @@ -1,5 +1,5 @@ /* Define list of all signal numbers and their names. - Copyright (C) 1997-2000, 2002, 2003, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ const char *const __new_sys_siglist[NSIG] = #include #undef init_sig }; -strong_alias (__new_sys_siglist, _sys_siglist_internal) +libc_hidden_ver (__new_sys_siglist, _sys_siglist) const char *const __new_sys_sigabbrev[NSIG] = { @@ -36,7 +36,6 @@ const char *const __new_sys_sigabbrev[NSIG] = #include #undef init_sig }; -strong_alias (__new_sys_sigabbrev, _sys_sigabbrev_internal) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) declare_symbol_alias (__old_sys_siglist, __new_sys_siglist, object, -- cgit 1.4.1