vasnprintf: Fix syntax errors in libintl build on mingw.

diff --git a/ChangeLog b/ChangeLog
index 6bd0b3ebc1e3bca8ae28786b3e879c27057840d4..d4a6a53accd2ef57703e9eb921fdcdd8978f929f 100644 (file)
--- 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.
 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 836bf10c5e9f54ae6d553a5164996fd0d1a76d3c..41c62712fbfccf3c5a5aae5fc6941056cc8a5129 100644 (file)
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -2889,8 +2889,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       length += n;
                     }
                 }
                       length += n;
                     }
                 }

-              }

 # endif
 # 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')
 #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;
                   }
                     length += count;
                     break;
                   }

+#undef pad_ourselves
+#undef prec_ourselves

               }
           }
       }
               }
           }
       }