Mercurial > hg > octave-kai > gnulib-hg

changeset 11220:96097ce626ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Oops, ignore NEED_PRINTF_DIRECTIVE_LS when IN_LIBINTL is defined.
author Bruno Haible <bruno@clisp.org>
date Thu, 26 Feb 2009 13:03:16 +0100
parents aaeb2f86d096
children 9ba87e1db372
files lib/vasnprintf.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -210,7 +210,7 @@
 # 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 @@
 		  }
 	      }
 #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