From cf3252a50dc8b0c977f558cec3902d7f06857fad Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 22 Mar 2023 17:46:23 +0100 Subject: [PATCH 2/3] vasnwprintf: Fix a "warning: unused function 'wmax_room_needed'". * lib/vasnprintf.c (MAX_ROOM_NEEDED): Adjust #if condition. --- ChangeLog | 5 +++++ lib/vasnprintf.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e869463550..c6393d949c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-03-22 Bruno Haible + + vasnwprintf: Fix a "warning: unused function 'wmax_room_needed'". + * lib/vasnprintf.c (MAX_ROOM_NEEDED): Adjust #if condition. + 2023-03-22 Bruno Haible vasnwprintf: Simplify last change. diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index fa9344b831..e784dfe37e 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1610,7 +1610,7 @@ is_borderline (const char *digits, size_t precision) #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF +#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* Use a different function name, to make it possible that the 'wchar_t' parametrization and the 'char' parametrization get compiled in the same -- 2.34.1