From: Bruno Haible <bruno@clisp.org>
Date: Thu, 26 Feb 2009 12:03:16 +0000 (+0100)
Subject: Oops, ignore NEED_PRINTF_DIRECTIVE_LS when IN_LIBINTL is defined.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd3911a06cbd692edc573dc86042e2d178d53882;p=pspp

Oops, ignore NEED_PRINTF_DIRECTIVE_LS when IN_LIBINTL is defined.
---

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