diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-02-16 14:54:30 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-02-16 14:54:30 +0100 |
| commit | d2995f218548fb6e506348377bf150c69dd231a6 (patch) | |
| tree | f3947cffa865d6825f1d64a027010b829f2e6182 /libquadmath/printf/quadmath-printf.c | |
| parent | 5037599a7442f3b528905f13221c8affa5a9f20e (diff) | |
| download | gcc-d2995f218548fb6e506348377bf150c69dd231a6.zip gcc-d2995f218548fb6e506348377bf150c69dd231a6.tar.gz gcc-d2995f218548fb6e506348377bf150c69dd231a6.tar.bz2 | |
quadmath-printf.c: Also check __GLIBC__ when checking whether workarounds for printf hook handling...
* printf/quadmath-printf.c: Also check __GLIBC__ when checking
whether workarounds for printf hook handling should be added.
* configure.ac: Check for locale.h too.
(USE_LOCALE_SUPPORT): Remove check.
(USE_NL_LANGINFO, USE_NL_LANGINFO_WC, USE_LOCALECONV): New checks.
(USE_I18_NUMBER_H): Check also for _NL_CTYPE_MB_CUR_MAX.
* printf/printf_fphex.c (__quadmath_printf_fphex): Use nl_langinfo
or localeconv for narrow version and nl_langinfo if USE_NL_LANGINFO_WC
for wide version.
* printf/quadmath-printf.h: Include locale.h if HAVE_LOCALE_H.
* printf/printf_fp.c (USE_I18N_NUMBER_H): Don't define to 0.
(__quadmath_printf_fp): Use nl_langinfo or localeconv for narrow
version and nl_langinfo if USE_NL_LANGINFO_WC for wide version.
Guard nl_langinfo (_NL_CTYPE_MB_CUR_MAX) use with
USE_I18N_NUMBER_H #ifdef.
* configure: Regenerated.
* config.h.in: Regenerated.
From-SVN: r170211
Diffstat (limited to 'libquadmath/printf/quadmath-printf.c')
| -rw-r--r-- | libquadmath/printf/quadmath-printf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libquadmath/printf/quadmath-printf.c b/libquadmath/printf/quadmath-printf.c index 4f5305e..750dc24 100644 --- a/libquadmath/printf/quadmath-printf.c +++ b/libquadmath/printf/quadmath-printf.c @@ -292,7 +292,7 @@ flt128_ais (const struct printf_info *info, size_t n __attribute__ ((unused)), size[0] = sizeof (__float128); return 1; } -#if __GLIBC_MINOR__ <= 13 +#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 13) /* Workaround bug in glibc printf hook handling. */ size[0] = -1; switch (info->spec) |