diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-10-03 18:27:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-10-03 18:27:30 +0000 |
| commit | ac97dec17a09b31b0407cbd4f49e2f2a45e3b17e (patch) | |
| tree | 9d7ba4b749aa2f9489737ab9aaedbdecfca34ce3 | |
| parent | ee868c89aee79e85af2e6d3e2c1289b78f6b3078 (diff) | |
* 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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | misc/sys/cdefs.h | 9 | ||||
| -rw-r--r-- | wcsmbs/bits/wchar2.h | 16 |
3 files changed, 21 insertions, 8 deletions
@@ -1,5 +1,9 @@ 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+ add __artificial__ attribute. diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 56b7f95b1c..efdc4f97e0 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -360,6 +360,10 @@ extern __typeof (name) name __asm (__ASMNAME (#alias)); # define __LDBL_REDIR_DECL(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 #if !defined __LDBL_COMPAT || !defined __REDIRECT @@ -368,6 +372,11 @@ # define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW # define __LDBL_REDIR_NTH(name, proto) name proto __THROW # 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 /* sys/cdefs.h */ diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h index 0c940d7221..2ec4ce17e0 100644 --- a/wcsmbs/bits/wchar2.h +++ b/wcsmbs/bits/wchar2.h @@ -274,10 +274,10 @@ extern int __swprintf_chk (wchar_t *__restrict __s, size_t __n, __const wchar_t *__restrict __format, ...) __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 6))) */; -extern int __REDIRECT_NTH (__swprintf_alias, - (wchar_t *__restrict __s, size_t __n, - __const wchar_t *__restrict __fmt, ...), - swprintf); +extern int __REDIRECT_NTH_LDBL (__swprintf_alias, + (wchar_t *__restrict __s, size_t __n, + __const wchar_t *__restrict __fmt, ...), + swprintf); #ifdef __va_arg_pack __extern_always_inline int @@ -305,10 +305,10 @@ extern int __vswprintf_chk (wchar_t *__restrict __s, size_t __n, __gnuc_va_list __arg) __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 0))) */; -extern int __REDIRECT_NTH (__vswprintf_alias, - (wchar_t *__restrict __s, size_t __n, - __const wchar_t *__restrict __fmt, - __gnuc_va_list __ap), vswprintf); +extern int __REDIRECT_NTH_LDBL (__vswprintf_alias, + (wchar_t *__restrict __s, size_t __n, + __const wchar_t *__restrict __fmt, + __gnuc_va_list __ap), vswprintf); __extern_always_inline int __NTH (vswprintf (wchar_t *__restrict __s, size_t __n, |