]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
projects / thirdparty / gettext.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3158c1d)
Update from gnulib.
authorBruno Haible <bruno@clisp.org>
Mon, 5 Nov 2007 23:47:49 +0000 (23:47 +0000)
committerBruno Haible <bruno@clisp.org>
Tue, 23 Jun 2009 10:15:30 +0000 (12:15 +0200)
gettext-runtime/intl/ChangeLog patch | blob | blame | history
gettext-runtime/intl/vasnprintf.c patch | blob | blame | history
gettext-runtime/libasprintf/ChangeLog patch | blob | blame | history
gettext-runtime/libasprintf/vasnprintf.c patch | blob | blame | history

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index c5a59ea337322b14d3385c2fd9fac5c5d63447d7..5e545c658c5606c19656068407534a01e08c9846 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-05  Bruno Haible  <bruno@clisp.org>
+
+       * vasnprintf.c (VASNPRINTF): Expand the NEED_PRINTF_DIRECTIVE_A
+       code when NEED_PRINTF_LONG_DOUBLE or NEED_PRINTF_DOUBLE is set.
+       Needed on Cygwin, where !NEED_PRINTF_DIRECTIVE_A && NEED_PRINTF_DOUBLE.
+       Reported by Eric Blake.
+
 2007-11-04  Bruno Haible  <bruno@clisp.org>
 
        * lock.h: Protect all macro definitions containing an 'if' statement
diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index 3f2c88615bb59d35960674194dd77131ce755b47..4a8e7f05a6018309cfadc8ae0a00e42658992176 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -105,10 +105,14 @@
 # include "fpucw.h"
 #endif
 
-#if NEED_PRINTF_DIRECTIVE_A && !defined IN_LIBINTL
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
 # include "isnan.h"
 # include "printf-frexp.h"
+#endif
+
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
+# include <math.h>
 # include "isnanl-nolibm.h"
 # include "printf-frexpl.h"
 # include "fpucw.h"
@@ -2034,8 +2038,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                  }
              }
 #endif
-#if NEED_PRINTF_DIRECTIVE_A && !defined IN_LIBINTL
-           else if (dp->conversion == 'a' || dp->conversion == 'A')
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
+           else if ((dp->conversion == 'a' || dp->conversion == 'A')
+# if !(NEED_PRINTF_DIRECTIVE_A || (NEED_PRINTF_LONG_DOUBLE && NEED_PRINTF_DOUBLE))
+                    && (0
+#  if NEED_PRINTF_DOUBLE
+                        || a.arg[dp->arg_index].type == TYPE_DOUBLE
+#  endif
+#  if NEED_PRINTF_LONG_DOUBLE
+                        || a.arg[dp->arg_index].type == TYPE_LONGDOUBLE
+#  endif
+                       )
+# endif
+                   )
              {
                arg_type type = a.arg[dp->arg_index].type;
                int flags = dp->flags;
@@ -2153,6 +2168,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                p = tmp;
                if (type == TYPE_LONGDOUBLE)
                  {
+# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE
                    long double arg = a.arg[dp->arg_index].a.a_longdouble;
 
                    if (isnanl (arg))
@@ -2272,7 +2288,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                }
                              }
                              *p++ = dp->conversion - 'A' + 'P';
-# if WIDE_CHAR_VERSION
+#  if WIDE_CHAR_VERSION
                              {
                                static const wchar_t decimal_format[] =
                                  { '%', '+', 'd', '\0' };
@@ -2280,7 +2296,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                              }
                              while (*p != '\0')
                                p++;
-# else
+#  else
                              if (sizeof (DCHAR_T) == 1)
                                {
                                  sprintf ((char *) p, "%+d", exponent);
@@ -2295,14 +2311,18 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  for (ep = expbuf; (*p = *ep) != '\0'; ep++)
                                    p++;
                                }
-# endif
+#  endif
                          }
 
                        END_LONG_DOUBLE_ROUNDING ();
                      }
+# else
+                   abort ();
+# endif
                  }
                else
                  {
+# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE
                    double arg = a.arg[dp->arg_index].a.a_double;
 
                    if (isnan (arg))
@@ -2419,7 +2439,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                }
                              }
                              *p++ = dp->conversion - 'A' + 'P';
-# if WIDE_CHAR_VERSION
+#  if WIDE_CHAR_VERSION
                              {
                                static const wchar_t decimal_format[] =
                                  { '%', '+', 'd', '\0' };
@@ -2427,7 +2447,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                              }
                              while (*p != '\0')
                                p++;
-# else
+#  else
                              if (sizeof (DCHAR_T) == 1)
                                {
                                  sprintf ((char *) p, "%+d", exponent);
@@ -2442,9 +2462,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  for (ep = expbuf; (*p = *ep) != '\0'; ep++)
                                    p++;
                                }
-# endif
+#  endif
                          }
                      }
+# else
+                   abort ();
+# endif
                  }
                /* The generated string now extends from tmp to p, with the
                   zero padding insertion point being at pad_ptr.  */
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 8086fbdbc5556e8630d0449cf69f8b45188f5dcf..65b5c8eca8dc310b3972ec916be73351f87fee33 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-05  Bruno Haible  <bruno@clisp.org>
+
+       * vasnprintf.c (VASNPRINTF): Expand the NEED_PRINTF_DIRECTIVE_A
+       code when NEED_PRINTF_LONG_DOUBLE or NEED_PRINTF_DOUBLE is set.
+       Needed on Cygwin, where !NEED_PRINTF_DIRECTIVE_A && NEED_PRINTF_DOUBLE.
+       Reported by Eric Blake.
+
 2007-11-04  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (DCHAR_IS_TCHAR, DCHAR_CPY): Undefine at the end.
diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 3f2c88615bb59d35960674194dd77131ce755b47..4a8e7f05a6018309cfadc8ae0a00e42658992176 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -105,10 +105,14 @@
 # include "fpucw.h"
 #endif
 
-#if NEED_PRINTF_DIRECTIVE_A && !defined IN_LIBINTL
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
 # include <math.h>
 # include "isnan.h"
 # include "printf-frexp.h"
+#endif
+
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
+# include <math.h>
 # include "isnanl-nolibm.h"
 # include "printf-frexpl.h"
 # include "fpucw.h"
@@ -2034,8 +2038,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                  }
              }
 #endif
-#if NEED_PRINTF_DIRECTIVE_A && !defined IN_LIBINTL
-           else if (dp->conversion == 'a' || dp->conversion == 'A')
+#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
+           else if ((dp->conversion == 'a' || dp->conversion == 'A')
+# if !(NEED_PRINTF_DIRECTIVE_A || (NEED_PRINTF_LONG_DOUBLE && NEED_PRINTF_DOUBLE))
+                    && (0
+#  if NEED_PRINTF_DOUBLE
+                        || a.arg[dp->arg_index].type == TYPE_DOUBLE
+#  endif
+#  if NEED_PRINTF_LONG_DOUBLE
+                        || a.arg[dp->arg_index].type == TYPE_LONGDOUBLE
+#  endif
+                       )
+# endif
+                   )
              {
                arg_type type = a.arg[dp->arg_index].type;
                int flags = dp->flags;
@@ -2153,6 +2168,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                p = tmp;
                if (type == TYPE_LONGDOUBLE)
                  {
+# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE
                    long double arg = a.arg[dp->arg_index].a.a_longdouble;
 
                    if (isnanl (arg))
@@ -2272,7 +2288,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                }
                              }
                              *p++ = dp->conversion - 'A' + 'P';
-# if WIDE_CHAR_VERSION
+#  if WIDE_CHAR_VERSION
                              {
                                static const wchar_t decimal_format[] =
                                  { '%', '+', 'd', '\0' };
@@ -2280,7 +2296,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                              }
                              while (*p != '\0')
                                p++;
-# else
+#  else
                              if (sizeof (DCHAR_T) == 1)
                                {
                                  sprintf ((char *) p, "%+d", exponent);
@@ -2295,14 +2311,18 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  for (ep = expbuf; (*p = *ep) != '\0'; ep++)
                                    p++;
                                }
-# endif
+#  endif
                          }
 
                        END_LONG_DOUBLE_ROUNDING ();
                      }
+# else
+                   abort ();
+# endif
                  }
                else
                  {
+# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE
                    double arg = a.arg[dp->arg_index].a.a_double;
 
                    if (isnan (arg))
@@ -2419,7 +2439,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                }
                              }
                              *p++ = dp->conversion - 'A' + 'P';
-# if WIDE_CHAR_VERSION
+#  if WIDE_CHAR_VERSION
                              {
                                static const wchar_t decimal_format[] =
                                  { '%', '+', 'd', '\0' };
@@ -2427,7 +2447,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                              }
                              while (*p != '\0')
                                p++;
-# else
+#  else
                              if (sizeof (DCHAR_T) == 1)
                                {
                                  sprintf ((char *) p, "%+d", exponent);
@@ -2442,9 +2462,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                  for (ep = expbuf; (*p = *ep) != '\0'; ep++)
                                    p++;
                                }
-# endif
+#  endif
                          }
                      }
+# else
+                   abort ();
+# endif
                  }
                /* The generated string now extends from tmp to p, with the
                   zero padding insertion point being at pad_ptr.  */
Mirror of https://github.com/autotools-mirror/gettext.git