summaryrefslogtreecommitdiff
path: root/lib/vasnprintf.c
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2009-02-26 13:03:16 +0100
committerBruno Haible <bruno@clisp.org>2009-02-26 13:03:16 +0100
commitbd3911a06cbd692edc573dc86042e2d178d53882 (patch)
treebfe4a2a7e6e2051d993fe6b7590ca40c517301f5 /lib/vasnprintf.c
parent220f76a18ac3dc194f5dc7a53781f646e4fa4de6 (diff)
downloadgnulib-bd3911a06cbd692edc573dc86042e2d178d53882.tar.gz
Oops, ignore NEED_PRINTF_DIRECTIVE_LS when IN_LIBINTL is defined.
Diffstat (limited to 'lib/vasnprintf.c')
-rw-r--r--lib/vasnprintf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 672b098131..fa43ca6365 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -210,7 +210,7 @@ local_strnlen (const char *string, size_t maxlen)
# endif
#endif
-#if (!USE_SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && HAVE_WCHAR_T && (WIDE_CHAR_VERSION || DCHAR_IS_TCHAR)
+#if (!USE_SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T && (WIDE_CHAR_VERSION || DCHAR_IS_TCHAR)
# if HAVE_WCSLEN
# define local_wcslen wcslen
# else
@@ -2103,7 +2103,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
}
}
#endif
-#if (!USE_SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && HAVE_WCHAR_T
+#if (!USE_SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T
else if (dp->conversion == 's'
# if WIDE_CHAR_VERSION
&& a.arg[dp->arg_index].type != TYPE_WIDE_STRING