Tweak last commit.

diff --git a/ChangeLog b/ChangeLog
index 47fbf013d840f17282aa3a3027b363659b6b6985..96a122d4722a35f67715ecaebeaec31f67b4566c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-18  Bruno Haible  <bruno@clisp.org>
+
+       * lib/vasnprintf.c (decimal_point_char): Define also if
+       NEED_PRINTF_INFINITE_LONG_DOUBLE.
+       (VASNPRINTF): When printing ±0.0L in NEED_PRINTF_INFINITE_LONG_DOUBLE
+       case with 'e' format, always use two digits for the exponent.
+       Reported by Jim Meyering.
+
 2008-09-16  Bruno Haible  <bruno@clisp.org>
        and Eric Blake  <ebb9@byu.net>
 

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index f50ca3fcd44751c256d8a67630bb254fc03991d9..e4bfca3a4e495245b1b64890cfccae2c3e46a273 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -215,7 +215,7 @@ local_wcslen (const wchar_t *s)
 #undef remainder
 #define remainder rem
 
-#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL
 /* Determine the decimal-point character according to the current locale.  */
 # ifndef decimal_point_char_defined
 #  define decimal_point_char_defined 1
@@ -3167,11 +3167,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  }
                                *p++ = dp->conversion; /* 'e' or 'E' */
                                *p++ = '+';
-                               /* Produce the same number of exponent digits as
-                                  the native printf implementation.  */
-#   if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-                               *p++ = '0';
-#   endif
                                *p++ = '0';
                                *p++ = '0';
                              }