summaryrefslogtreecommitdiff
path: root/stdio-common/printf_fp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-26 23:41:17 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-26 23:41:17 +0000
commitd8337213c83c3bd4aa32e16669745dd7ee32b329 (patch)
treec9f1296e2e3f355d296e4d8258c8380393006fc0 /stdio-common/printf_fp.c
parent5be068fc154b697b56cce171a73eccf572f86937 (diff)
downloadglibc-d8337213c83c3bd4aa32e16669745dd7ee32b329.tar.gz
Update.
* locale/C-monetary.c: Set mon_decimal to empty string. Add missing entry _NL_MONETARY_CRNCYSTR. * stdio-common/printf_fp.c: If MON_DECIAL_POINT is not provided use DECIMAL_POINT information. * locale/C-numeric.c: Set mon_grouping entry to empty string. * locale/C-time.c: Add date_fmt entries. Remove two wrong entries. Correct value for number of entries. * locale/localeconv.c: Normalize result passed back in .grouping. Fix assignment to .int_* entries. * locale/Makefile (tests): Add tst-C-locale. * locale/tst-C-locale.c: New file. * locale/setlocale.c: Use LOCALEDIR and not LOCALE_PATH to locate locale files. * locale/newlocale.c: Likewise. 2000-10-26 GOTO Masanori <gotom@debian.or.jp> * locale/langinfo.h: Define _DATE_FMT and _NL_W_DATE_FMT. * locale/categories.def: New support for date_fmt. * locale/programs/ld-time.c: Likewise. * locale/programs/locfile-kw.gperf: Likewise. * locale/programs/locfile-kw.h: Likewise. * locale/programs/locfile-token.h: Likewise. 2000-10-26 Jakub Jelinek <jakub@redhat.com> * sysdeps/ieee754/ldbl-128/e_hypotl.c: New. * math/libm-test.inc (cabs_test, cexp_test, csqrt_test, hypot_test): Increase precision of constants. * sysdeps/alpha/fpu/libm-test-ulps: Update. * sysdeps/arm/libm-test-ulps: Update. * sysdeps/i386/fpu/libm-test-ulps: Update. * sysdeps/ia64/fpu/libm-test-ulps: Update. * sysdeps/m68k/fpu/libm-test-ulps: Update. * sysdeps/mips/fpu/libm-test-ulps: Update. * sysdeps/powerpc/fpu/libm-test-ulps: Update. * sysdeps/sparc/sparc32/fpu/libm-test-ulps: Update. * sysdeps/sparc/sparc64/fpu/libm-test-ulps: Update. * sysdeps/sh/sh4/fpu/libm-test-ulps: Update. * sysdeps/s390/fpu/libm-test-ulps: Update. 2000-10-26 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'stdio-common/printf_fp.c')
-rw-r--r--stdio-common/printf_fp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 557a02224b..4d4370a2d3 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -252,11 +252,17 @@ __printf_fp (FILE *fp,
else
{
decimal = _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT);
+ if (*decimal == '\0')
+ decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
decimalwc = _NL_CURRENT_WORD (LC_MONETARY,
_NL_MONETARY_DECIMAL_POINT_WC);
+ if (decimalwc == L'\0')
+ decimalwc = _NL_CURRENT_WORD (LC_NUMERIC,
+ _NL_NUMERIC_DECIMAL_POINT_WC);
}
/* The decimal point character must not be zero. */
- assert (*decimal != L'\0');
+ assert (*decimal != '\0');
+ assert (decimalwc != L'\0');
if (info->group)
{