Fix syntax errors in libintl build on mingw.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index f204d787cb4ab13496372b79d33b19162901520a..78da53513f0c0bcb346858cd502366d435aa3ff6 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-09  Bruno Haible  <bruno@clisp.org>
+
+       vasnprintf: Fix syntax errors in libintl build on mingw.
+       * vasnprintf.c (VASNPRINTF): Move a closing brace. Undefine
+       pad_ourselves and prec_ourselves after use.
+
 2010-04-03  Bruno Haible  <bruno@clisp.org>
 
        localename: Port to MacOS X 10.6.

diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index 82d4b94c88106401489fc218a8c454e1cbf0585f..8a07ca6e72da1331e3bf1a741aaa6efbf80085ac 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -2890,8 +2890,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')
@@ -5499,6 +5499,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     length += count;
                     break;
                   }
+#undef pad_ourselves
+#undef prec_ourselves
               }
           }
       }

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 56172691605d780d52a4f77b74581b65a9ba289d..18e547ed29ab2e337ee80ee0ab53116d518887a1 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-09  Bruno Haible  <bruno@clisp.org>
+
+       vasnprintf: Fix syntax errors in libintl build on mingw.
+       * vasnprintf.c (VASNPRINTF): Move a closing brace. Undefine
+       pad_ourselves and prec_ourselves after use.
+
 2010-04-24  Bruno Haible  <bruno@clisp.org>
 
        vasnprintf: Correct errno value in case of out-of-memory.

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 82d4b94c88106401489fc218a8c454e1cbf0585f..8a07ca6e72da1331e3bf1a741aaa6efbf80085ac 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -2890,8 +2890,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')
@@ -5499,6 +5499,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     length += count;
                     break;
                   }
+#undef pad_ourselves
+#undef prec_ourselves
               }
           }
       }