diff options
author | Frank Li <lznuaa@gmail.com> | 2009-09-16 10:20:22 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-09-18 20:00:42 -0700 |
commit | 71064e3f86fbf2eb5c2b55a3024051f9542ae229 (patch) | |
tree | 9287bbdfe8a2196470fa7d5647f65baf82d6bbc9 /builtin-merge.c | |
parent | d7fa500fb598d725bda3427535e87f06caf93ee8 (diff) | |
download | git-71064e3f86fbf2eb5c2b55a3024051f9542ae229.tar.gz |
Test for WIN32 instead of __MINGW32_
The code which is conditional on MinGW32 is actually conditional on Windows.
Use the WIN32 symbol, which is defined by the MINGW32 and MSVC environments,
but not by Cygwin.
Define SNPRINTF_SIZE_CORR=1 for MSVC too, as its vsnprintf function does
not add NUL at the end of the buffer if the result fits the buffer size
exactly.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions