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 --- wcsmbs/wchar.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'wcsmbs/wchar.h') diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index fb7a641..670dc79 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -561,8 +561,8 @@ extern __inline float __NTH (wcstof (__const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr)) { return __wcstof_internal (__nptr, __endptr, 0); } -extern __inline long double # ifndef __LDBL_COMPAT +extern __inline long double __NTH (wcstold (__const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr)) { return __wcstold_internal (__nptr, __endptr, 0); } @@ -833,16 +833,15 @@ extern size_t wcsftime_l (wchar_t *__restrict __s, size_t __maxsize, # include #endif - -#ifdef __LDBL_COMPAT -# include -#endif - /* Define some macros helping to catch buffer overflows. */ #if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus # include #endif +#ifdef __LDBL_COMPAT +# include +#endif + __END_DECLS #endif /* _WCHAR_H defined */ -- cgit v1.1