From: Bruno Haible <bruno@clisp.org>
Date: Sun, 9 May 2010 09:14:46 +0000 (+0200)
Subject: vasnprintf: Fix syntax errors in libintl build on mingw.
X-Git-Tag: v0.1~4164
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=7f59c22a09957e1f6ccfdc8e4256fd4f9c6d3445;p=gnulib.git

vasnprintf: Fix syntax errors in libintl build on mingw.
---

diff --git a/ChangeLog b/ChangeLog
index 6bd0b3ebc..d4a6a53ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-09  Bruno Haible  <bruno@clisp.org>
+
+	vasnprintf: Fix syntax errors in libintl build on mingw.
+	* lib/vasnprintf.c (VASNPRINTF): Move a closing brace. Undefine
+	pad_ourselves and prec_ourselves after use.
+
 2010-05-08  Bruno Haible  <bruno@clisp.org>
 
 	* lib/config.charset: Update comments for Cygwin 1.7.
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 836bf10c5..41c62712f 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -2889,8 +2889,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       length += n;
                     }
                 }
-              }
 # endif
+              }
 #endif
 #if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
             else if ((dp->conversion == 'a' || dp->conversion == 'A')
@@ -5498,6 +5498,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     length += count;
                     break;
                   }
+#undef pad_ourselves
+#undef prec_ourselves
               }
           }
       }