Assume the 'long double' type.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 51d34cd128daafb4e085a49753bbe1c91414e908..24156036c02065d2747980694d7515b1047af6a6 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,6 +1,13 @@
+2007-04-06  Bruno Haible  <bruno@clisp.org>
+
+       * printf-args.h: Assume HAVE_LONG_DOUBLE to be true.
+       * printf-args.c: Likewise.
+       * printf-parse.c: Likewise.
+       * vasnprintf.c: Likewise.
+
 2007-03-25  Bruno Haible  <bruno@clisp.org>
 
-       * lib/printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t.
+       * printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t.
        (PRINTF_PARSE): Make the support for size specifier 'j' unconditional.
 
 2007-03-04  Bruno Haible  <bruno@clisp.org>

diff --git a/gettext-runtime/intl/printf-args.c b/gettext-runtime/intl/printf-args.c
index b43f89b7bba48062267ebf4686aaea99785a7900..a174cd1b12d1110707730c70b9c35347d9d78e36 100644 (file)
--- a/gettext-runtime/intl/printf-args.c
+++ b/gettext-runtime/intl/printf-args.c
@@ -68,11 +68,9 @@ printf_fetchargs (va_list args, arguments *a)
       case TYPE_DOUBLE:
        ap->a.a_double = va_arg (args, double);
        break;
-#if HAVE_LONG_DOUBLE
       case TYPE_LONGDOUBLE:
        ap->a.a_longdouble = va_arg (args, long double);
        break;
-#endif
       case TYPE_CHAR:
        ap->a.a_char = va_arg (args, int);
        break;

diff --git a/gettext-runtime/intl/printf-args.h b/gettext-runtime/intl/printf-args.h
index 43eef0e899a8702eb24fb89b98fd261c3159a0de..f61431ab3ff8b18a5b4a3bef16640edda1cf2eb8 100644 (file)
--- a/gettext-runtime/intl/printf-args.h
+++ b/gettext-runtime/intl/printf-args.h
@@ -53,9 +53,7 @@ typedef enum
   TYPE_ULONGLONGINT,
 #endif
   TYPE_DOUBLE,
-#if HAVE_LONG_DOUBLE
   TYPE_LONGDOUBLE,
-#endif
   TYPE_CHAR,
 #if HAVE_WINT_T
   TYPE_WIDE_CHAR,
@@ -94,9 +92,7 @@ typedef struct
 #endif
     float                      a_float;
     double                     a_double;
-#if HAVE_LONG_DOUBLE
     long double                        a_longdouble;
-#endif
     int                                a_char;
 #if HAVE_WINT_T
     wint_t                     a_wide_char;

diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c
index ab3ecc746c3e2ec83c12e4a1a5d6c87fdcaa600e..016b32758e5b257f88516368d6cda5a66c86f003 100644 (file)
--- a/gettext-runtime/intl/printf-parse.c
+++ b/gettext-runtime/intl/printf-parse.c
@@ -422,12 +422,10 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                  break;
                case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
                case 'a': case 'A':
-#if HAVE_LONG_DOUBLE
                  if (flags >= 16 || (flags & 4))
                    type = TYPE_LONGDOUBLE;
                  else
-#endif
-                 type = TYPE_DOUBLE;
+                   type = TYPE_DOUBLE;
                  break;
                case 'c':
                  if (flags >= 8)

diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index fbc2d743d6116faf4789fab94da6b84fc6639a3a..e9a96e37aa2b49ce6ecb26883571565a4b638f28 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -409,7 +409,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                      break;
 
                    case 'f': case 'F':
-# if HAVE_LONG_DOUBLE
                      if (type == TYPE_LONGDOUBLE)
                        tmp_length =
                          (unsigned int) (LDBL_MAX_EXP
@@ -419,7 +418,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                          + 1 /* turn floor into ceil */
                          + 10; /* sign, decimal point etc. */
                      else
-# endif
                        tmp_length =
                          (unsigned int) (DBL_MAX_EXP
                                          * 0.30103 /* binary -> decimal */
@@ -437,7 +435,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                      break;
 
                    case 'a': case 'A':
-# if HAVE_LONG_DOUBLE
                      if (type == TYPE_LONGDOUBLE)
                        tmp_length =
                          (unsigned int) (LDBL_DIG
@@ -445,7 +442,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                                         )
                          + 1; /* turn floor into ceil */
                      else
-# endif
                        tmp_length =
                          (unsigned int) (DBL_DIG
                                          * 0.831 /* decimal -> hexadecimal */
@@ -564,11 +560,9 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 #endif
                    *p++ = 'l';
                    break;
-#if HAVE_LONG_DOUBLE
                  case TYPE_LONGDOUBLE:
                    *p++ = 'L';
                    break;
-#endif
                  default:
                    break;
                  }
@@ -722,14 +716,12 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                          SNPRINTF_BUF (arg);
                        }
                        break;
-#if HAVE_LONG_DOUBLE
                      case TYPE_LONGDOUBLE:
                        {
                          long double arg = a.arg[dp->arg_index].a.a_longdouble;
                          SNPRINTF_BUF (arg);
                        }
                        break;
-#endif
                      case TYPE_CHAR:
                        {
                          int arg = a.arg[dp->arg_index].a.a_char;

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 5784f17b4db82b80da7c5f794885fc35c7139cf8..40e1dbf5e8dea99098b15dd57d7cd3c651090846 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-06  Bruno Haible  <bruno@clisp.org>
+
+       * printf-args.h: Assume HAVE_LONG_DOUBLE to be true.
+       * printf-args.c: Likewise.
+       * printf-parse.c: Likewise.
+       * vasnprintf.c: Likewise.
+
 2007-03-29  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (DEFS): New variable.
@@ -6,7 +13,7 @@
 
 2007-03-25  Bruno Haible  <bruno@clisp.org>
 
-       * lib/printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t.
+       * printf-parse.c [!IN_LIBINTL]: Include <stdint.h>, for intmax_t.
        (PRINTF_PARSE): Make the support for size specifier 'j' unconditional.
 
 2007-02-25  Bruno Haible  <bruno@clisp.org>

diff --git a/gettext-runtime/libasprintf/printf-args.c b/gettext-runtime/libasprintf/printf-args.c
index b43f89b7bba48062267ebf4686aaea99785a7900..a174cd1b12d1110707730c70b9c35347d9d78e36 100644 (file)
--- a/gettext-runtime/libasprintf/printf-args.c
+++ b/gettext-runtime/libasprintf/printf-args.c
@@ -68,11 +68,9 @@ printf_fetchargs (va_list args, arguments *a)
       case TYPE_DOUBLE:
        ap->a.a_double = va_arg (args, double);
        break;
-#if HAVE_LONG_DOUBLE
       case TYPE_LONGDOUBLE:
        ap->a.a_longdouble = va_arg (args, long double);
        break;
-#endif
       case TYPE_CHAR:
        ap->a.a_char = va_arg (args, int);
        break;

diff --git a/gettext-runtime/libasprintf/printf-args.h b/gettext-runtime/libasprintf/printf-args.h
index 43eef0e899a8702eb24fb89b98fd261c3159a0de..f61431ab3ff8b18a5b4a3bef16640edda1cf2eb8 100644 (file)
--- a/gettext-runtime/libasprintf/printf-args.h
+++ b/gettext-runtime/libasprintf/printf-args.h
@@ -53,9 +53,7 @@ typedef enum
   TYPE_ULONGLONGINT,
 #endif
   TYPE_DOUBLE,
-#if HAVE_LONG_DOUBLE
   TYPE_LONGDOUBLE,
-#endif
   TYPE_CHAR,
 #if HAVE_WINT_T
   TYPE_WIDE_CHAR,
@@ -94,9 +92,7 @@ typedef struct
 #endif
     float                      a_float;
     double                     a_double;
-#if HAVE_LONG_DOUBLE
     long double                        a_longdouble;
-#endif
     int                                a_char;
 #if HAVE_WINT_T
     wint_t                     a_wide_char;

diff --git a/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c
index ab3ecc746c3e2ec83c12e4a1a5d6c87fdcaa600e..016b32758e5b257f88516368d6cda5a66c86f003 100644 (file)
--- a/gettext-runtime/libasprintf/printf-parse.c
+++ b/gettext-runtime/libasprintf/printf-parse.c
@@ -422,12 +422,10 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                  break;
                case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
                case 'a': case 'A':
-#if HAVE_LONG_DOUBLE
                  if (flags >= 16 || (flags & 4))
                    type = TYPE_LONGDOUBLE;
                  else
-#endif
-                 type = TYPE_DOUBLE;
+                   type = TYPE_DOUBLE;
                  break;
                case 'c':
                  if (flags >= 8)

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index fbc2d743d6116faf4789fab94da6b84fc6639a3a..e9a96e37aa2b49ce6ecb26883571565a4b638f28 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -409,7 +409,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                      break;
 
                    case 'f': case 'F':
-# if HAVE_LONG_DOUBLE
                      if (type == TYPE_LONGDOUBLE)
                        tmp_length =
                          (unsigned int) (LDBL_MAX_EXP
@@ -419,7 +418,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                          + 1 /* turn floor into ceil */
                          + 10; /* sign, decimal point etc. */
                      else
-# endif
                        tmp_length =
                          (unsigned int) (DBL_MAX_EXP
                                          * 0.30103 /* binary -> decimal */
@@ -437,7 +435,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                      break;
 
                    case 'a': case 'A':
-# if HAVE_LONG_DOUBLE
                      if (type == TYPE_LONGDOUBLE)
                        tmp_length =
                          (unsigned int) (LDBL_DIG
@@ -445,7 +442,6 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                                         )
                          + 1; /* turn floor into ceil */
                      else
-# endif
                        tmp_length =
                          (unsigned int) (DBL_DIG
                                          * 0.831 /* decimal -> hexadecimal */
@@ -564,11 +560,9 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
 #endif
                    *p++ = 'l';
                    break;
-#if HAVE_LONG_DOUBLE
                  case TYPE_LONGDOUBLE:
                    *p++ = 'L';
                    break;
-#endif
                  default:
                    break;
                  }
@@ -722,14 +716,12 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                          SNPRINTF_BUF (arg);
                        }
                        break;
-#if HAVE_LONG_DOUBLE
                      case TYPE_LONGDOUBLE:
                        {
                          long double arg = a.arg[dp->arg_index].a.a_longdouble;
                          SNPRINTF_BUF (arg);
                        }
                        break;
-#endif
                      case TYPE_CHAR:
                        {
                          int arg = a.arg[dp->arg_index].a.a_char;

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 83d2dbef9e60e00b7d6dd8a4d5bd235bd6fc2b60..1f510b33dd780df87aae230aa35df656f6b0d3a2 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -2,7 +2,8 @@
 
        Assume the 'long double' type.
        * longdouble.m4: Remove file.
-       * Makefile.am (EXTRA_DIST): Remove it.
+       * intl.m4: Remove gt_TYPE_LONGDOUBLE invocation.
+       * Makefile.am (EXTRA_DIST): Remove longdouble.m4.
 
 2007-03-04  Bruno Haible  <bruno@clisp.org>