From b9d1ef9b4dad3dfc430dc5cacc0053d2b49d3835 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 9 May 2010 11:16:57 +0200 Subject: [PATCH] Fix syntax errors in libintl build on mingw. --- gettext-runtime/intl/ChangeLog | 6 ++++++ gettext-runtime/intl/vasnprintf.c | 4 +++- gettext-runtime/libasprintf/ChangeLog | 6 ++++++ gettext-runtime/libasprintf/vasnprintf.c | 4 +++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index f204d787c..78da53513 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,9 @@ +2010-05-09 Bruno Haible + + 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 localename: Port to MacOS X 10.6. diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c index 82d4b94c8..8a07ca6e7 100644 --- 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 561726916..18e547ed2 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,9 @@ +2010-05-09 Bruno Haible + + 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 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 82d4b94c8..8a07ca6e7 100644 --- 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 } } } -- 2.47.2