From: Bruno Haible <bruno@clisp.org>
Date: Mon, 5 Nov 2007 23:47:49 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: v0.17~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdff4af9a6a2a5e7aee0850380d7b1a6356c564e;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index c5a59ea33..5e545c658 100644
--- 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 3f2c88615..4a8e7f05a 100644
--- 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 8086fbdbc..65b5c8eca 100644
--- 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 3f2c88615..4a8e7f05a 100644
--- 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.  */