X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fvasnprintf.c;h=fa43ca636578cbdffbe9e4711a139e12aed21756;hb=1a2869593e115e4a6c74aaa0b23ca612357403ce;hp=31cb46bd5a35b9f7684db4312fa011ad8d87c1ef;hpb=1c7339107c345bd4b0e94b6f11937f562516a06d;p=gnulib.git

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 31cb46bd5..fa43ca636 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 && 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 && 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