diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-07-10 08:24:40 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-07-10 08:24:40 +0800 |
| commit | faca007b61422969f5c8888c67a1e356a8c5b64a (patch) | |
| tree | c0765cf520bbc7d0e62c66d7e6f6b66968f76503 /lib | |
| parent | 8dd34ad8d80b0bd07cf59add94bfb6a6e52098b2 (diff) | |
| download | emacs-faca007b61422969f5c8888c67a1e356a8c5b64a.tar.gz | |
; Update from Gnulib
* lib/vasnprintf.c (VASNPRINTF):
* m4/printf.m4 (gl_SWPRINTF_WORKS):
(gl_SWPRINTF_DIRECTIVE_LA):
* m4/vasnprintf.m4 (gl_PREREQ_PRINTF_PARSE):
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vasnprintf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 63a6cd60f35..9ad31b2a084 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -247,7 +247,7 @@ local_strnlen (const char *string, size_t maxlen) # endif #endif -#if (((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T +#if (((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_WPRINTF_DIRECTIVE_LC) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T # if HAVE_WCSLEN # define local_wcslen wcslen # else @@ -2765,14 +2765,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } } #endif -#if WIDE_CHAR_VERSION && !DCHAR_IS_TCHAR +#if WIDE_CHAR_VERSION && (!DCHAR_IS_TCHAR || NEED_WPRINTF_DIRECTIVE_LC) else if ((dp->conversion == 's' && a.arg[dp->arg_index].type == TYPE_WIDE_STRING) || (dp->conversion == 'c' && a.arg[dp->arg_index].type == TYPE_WIDE_CHAR)) { /* %ls or %lc in vasnwprintf. See the specification of - fwprintf. */ + fwprintf. */ /* It would be silly to use snprintf ("%ls", ...) and then convert back the result from a char[] to a wchar_t[]. Instead, just copy the argument wchar_t[] to the result. */ |