* misc/sys/cdefs.h (__REDIRECT_LDBL, __REDIRECT_NTH_LDBL): New macros.

* wcsmbs/bits/wchar2.h (__swprintf_alias, __vswprintf_alias): Use
	__REDIRECT_NTH_LDBL macro rather than __REDIRECT_NTH.
This commit is contained in:
Ulrich Drepper 2007-10-03 18:27:30 +00:00
parent ee868c89ae
commit ac97dec17a
3 changed files with 21 additions and 8 deletions

View File

@ -1,5 +1,9 @@
2007-10-03 Jakub Jelinek 2007-10-03 Jakub Jelinek
* misc/sys/cdefs.h (__REDIRECT_LDBL, __REDIRECT_NTH_LDBL): New macros.
* wcsmbs/bits/wchar2.h (__swprintf_alias, __vswprintf_alias): Use
__REDIRECT_NTH_LDBL macro rather than __REDIRECT_NTH.
* misc/sys/cdefs.h (__extern_always_inline): For GCC 4.3+ * misc/sys/cdefs.h (__extern_always_inline): For GCC 4.3+
add __artificial__ attribute. add __artificial__ attribute.

View File

@ -360,6 +360,10 @@
extern __typeof (name) name __asm (__ASMNAME (#alias)); extern __typeof (name) name __asm (__ASMNAME (#alias));
# define __LDBL_REDIR_DECL(name) \ # define __LDBL_REDIR_DECL(name) \
extern __typeof (name) name __asm (__ASMNAME ("__nldbl_" #name)); extern __typeof (name) name __asm (__ASMNAME ("__nldbl_" #name));
# define __REDIRECT_LDBL(name, proto, alias) \
__LDBL_REDIR1 (name, proto, __nldbl_##alias)
# define __REDIRECT_NTH_LDBL(name, proto, alias) \
__LDBL_REDIR1_NTH (name, proto, __nldbl_##alias)
# endif # endif
#endif #endif
#if !defined __LDBL_COMPAT || !defined __REDIRECT #if !defined __LDBL_COMPAT || !defined __REDIRECT
@ -368,6 +372,11 @@
# define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW # define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW
# define __LDBL_REDIR_NTH(name, proto) name proto __THROW # define __LDBL_REDIR_NTH(name, proto) name proto __THROW
# define __LDBL_REDIR_DECL(name) # define __LDBL_REDIR_DECL(name)
# ifdef __REDIRECT
# define __REDIRECT_LDBL(name, proto, alias) __REDIRECT (name, proto, alias)
# define __REDIRECT_NTH_LDBL(name, proto, alias) \
__REDIRECT_NTH (name, proto, alias)
# endif
#endif #endif
#endif /* sys/cdefs.h */ #endif /* sys/cdefs.h */

View File

@ -274,10 +274,10 @@ extern int __swprintf_chk (wchar_t *__restrict __s, size_t __n,
__const wchar_t *__restrict __format, ...) __const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wprintf__, 5, 6))) */; __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 6))) */;
extern int __REDIRECT_NTH (__swprintf_alias, extern int __REDIRECT_NTH_LDBL (__swprintf_alias,
(wchar_t *__restrict __s, size_t __n, (wchar_t *__restrict __s, size_t __n,
__const wchar_t *__restrict __fmt, ...), __const wchar_t *__restrict __fmt, ...),
swprintf); swprintf);
#ifdef __va_arg_pack #ifdef __va_arg_pack
__extern_always_inline int __extern_always_inline int
@ -305,10 +305,10 @@ extern int __vswprintf_chk (wchar_t *__restrict __s, size_t __n,
__gnuc_va_list __arg) __gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wprintf__, 5, 0))) */; __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 0))) */;
extern int __REDIRECT_NTH (__vswprintf_alias, extern int __REDIRECT_NTH_LDBL (__vswprintf_alias,
(wchar_t *__restrict __s, size_t __n, (wchar_t *__restrict __s, size_t __n,
__const wchar_t *__restrict __fmt, __const wchar_t *__restrict __fmt,
__gnuc_va_list __ap), vswprintf); __gnuc_va_list __ap), vswprintf);
__extern_always_inline int __extern_always_inline int
__NTH (vswprintf (wchar_t *__restrict __s, size_t __n, __NTH (vswprintf (wchar_t *__restrict __s, size_t __n,