Re: [PATCH 1/2] MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 29, 2016, 16:43 UTC
Message-ID: <xmqqio05z12u.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <56FAAC78.2040304@cs-ware.de>

Sven Strickroth <sven@cs-ware.de> writes:

Show 5 quoted lines

> In MSVC2015 the behavior of vsnprintf was changed.
> W/o this fix there is one character missing at the end.
>
> Signed-off-by: Sven Strickroth <sven@cs-ware.de>
> ---

Thanks.

I am not qualified to judge the correctness of the assertion that MSVC at or more recent than version 1900 does not need the correction and will wait for Windows folks to Ack.

Thanks.

Show 16 quoted lines

>  compat/snprintf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/compat/snprintf.c b/compat/snprintf.c
> index 42ea1ac..0b11688 100644
> --- a/compat/snprintf.c
> +++ b/compat/snprintf.c
> @@ -9,7 +9,7 @@
>   * always have room for a trailing NUL byte.
>   */
>  #ifndef SNPRINTF_SIZE_CORR
> -#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4)
> +#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4) && (!defined(_MSC_VER) || _MSC_VER < 1900)
>  #define SNPRINTF_SIZE_CORR 1
>  #else
>  #define SNPRINTF_SIZE_CORR 0