From 54e98f69e0e36ea8ad4e7a32b798ae90270bc1e0 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 14 Jan 2006 20:33:13 +0000 Subject: * sysdeps/ieee754/ldbl-opt/nldbl-compat.h (NLDBL_HIDDEN): Removed. (NLDBL_DECL): Rewritten. Remove __THROW from NLDBL_DECL uses. Use NLDBL_DECL for __vstrfmon, __vstrfmon_l. * sysdeps/ieee754/ldbl-opt/nldbl-asinh.c: Restore attribute_hidden. 2006-01-14 Jakub Jelinek * misc/sys/cdefs.h (__LDBL_REDIR1_DECL): Define. (__LDBL_REDIR_DECL): Stringize __nldbl and name. * stdlib/bits/monetary-ldbl.h: Remove pastos from wchar-ldbl.h. (strfmon, strfmon_l): Add __LDBL_REDIR_DECL. * stdlib/bits/stdlib-ldbl.h (strtold, strtold_l, __strtold_internal, qecvt, qfcvt, qgcvt, qecvt_r, qfcvt_r): Use __LDBL_REDIR1_DECL instead of __LDBL_REDIR_DECL. * wcsmbs/bits/wchar-ldbl.h: Remove stale #if. (__LDBL_REDIR_WCHAR): Remove. (fwprintf, wprintf, swprintf, vfwprintf, vwprintf, vswprintf, fwscanf, wscanf, swscanf, vfwscanf, vwscanf, vswscanf): Use __LDBL_REDIR_DECL instead of __LDBL_REDIR_WCHAR. (wcstold, wcstold_l, __wcstold_internal): Add __LDBL_REDIR1_DECL. * wcsmbs/wchar.h: Include bits/wchar-ldbl.h after bits/wchar2.h instead of before it. (wcstold inline): Move #ifndef __LDBL_COMPAT before extern keyword. * libio/bits/stdio-ldbl.h (__snprintf_chk, __vsnprintf_chk): Add __LDBL_REDIR_DECL. * misc/bits/syslog-ldbl.h (vsyslog): Protect with #ifdef __USE_BSD. (__syslog_chk, __vsyslog_chk): Add __LDBL_REDIR_DECL. 2006-01-14 Roland McGrath --- stdlib/bits/monetary-ldbl.h | 38 +++----------------------------------- stdlib/bits/stdlib-ldbl.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 43 deletions(-) (limited to 'stdlib/bits') diff --git a/stdlib/bits/monetary-ldbl.h b/stdlib/bits/monetary-ldbl.h index 2c0cff1..3e080f9 100644 --- a/stdlib/bits/monetary-ldbl.h +++ b/stdlib/bits/monetary-ldbl.h @@ -21,40 +21,8 @@ # error "Never include directly; use instead." #endif -#if defined __LDBL_COMPAT && defined __GNUC__ && __GNUC__ >= 2 +__LDBL_REDIR_DECL (strfmon) -# define __LDBL_REDIR_WCHAR(name) \ - extern __typeof (name) name __asm (__ASMNAME (__nldbl_##name)) - -# if defined __USE_ISOC99 || defined __USE_UNIX98 -__BEGIN_NAMESPACE_C99 -__LDBL_REDIR_WCHAR (fwprintf); -__LDBL_REDIR_WCHAR (wprintf); -__LDBL_REDIR_WCHAR (swprintf); -__LDBL_REDIR_WCHAR (vfwprintf); -__LDBL_REDIR_WCHAR (vwprintf); -__LDBL_REDIR_WCHAR (vswprintf); -__LDBL_REDIR_WCHAR (fwscanf); -__LDBL_REDIR_WCHAR (wscanf); -__LDBL_REDIR_WCHAR (swscanf); -__END_NAMESPACE_C99 -# endif - -# ifdef __USE_ISOC99 -__BEGIN_NAMESPACE_C99 -__LDBL_REDIR_WCHAR (vfwscanf); -__LDBL_REDIR_WCHAR (vwscanf); -__LDBL_REDIR_WCHAR (vswscanf); -__END_NAMESPACE_C99 -# endif - -#if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus -__LDBL_REDIR_DECL (__swprintf_chk) -__LDBL_REDIR_DECL (__vswprintf_chk) -# if __USE_FORTIFY_LEVEL > 1 -__LDBL_REDIR_DECL (__fwprintf_chk) -__LDBL_REDIR_DECL (__wprintf_chk) -__LDBL_REDIR_DECL (__vfwprintf_chk) -__LDBL_REDIR_DECL (__vwprintf_chk) -# endif +#ifdef __USE_GNU +__LDBL_REDIR_DECL (strfmon_l) #endif diff --git a/stdlib/bits/stdlib-ldbl.h b/stdlib/bits/stdlib-ldbl.h index 7c11a49..f966bd9 100644 --- a/stdlib/bits/stdlib-ldbl.h +++ b/stdlib/bits/stdlib-ldbl.h @@ -23,20 +23,20 @@ #ifdef __USE_ISOC99 __BEGIN_NAMESPACE_C99 -__LDBL_REDIR_DECL (strtold) +__LDBL_REDIR1_DECL (strtold, strtod) __END_NAMESPACE_C99 #endif #ifdef __USE_GNU -__LDBL_REDIR_DECL (strtold_l) +__LDBL_REDIR1_DECL (strtold_l, strtod_l) #endif -__LDBL_REDIR_DECL (__strtold_internal) +__LDBL_REDIR1_DECL (__strtold_internal, __strtod_internal) #ifdef __USE_MISC -__LDBL_REDIR_DECL (qecvt) -__LDBL_REDIR_DECL (qfcvt) -__LDBL_REDIR_DECL (qgcvt) -__LDBL_REDIR_DECL (qecvt_r) -__LDBL_REDIR_DECL (qfcvt_r) +__LDBL_REDIR1_DECL (qecvt, ecvt) +__LDBL_REDIR1_DECL (qfcvt, fcvt) +__LDBL_REDIR1_DECL (qgcvt, gcvt) +__LDBL_REDIR1_DECL (qecvt_r, ecvt_r) +__LDBL_REDIR1_DECL (qfcvt_r, fcvt_r) #endif -- cgit v1.1