summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorKirill Smelkov <kirr@mns.spb.ru>2014-04-09 16:48:27 +0400
committerJunio C Hamano <gitster@pobox.com>2014-04-09 10:08:35 -0700
commit22f4c27e68f448d5fce316a73ea3f7bab6aa1268 (patch)
treed63ccf7b1a113cb06187b64c8fee86e3b04fd713 /notes-merge.c
parent7195fbfaf5a539b8e8358097e02b63991e78a565 (diff)
downloadgit-22f4c27e68f448d5fce316a73ea3f7bab6aa1268.tar.gz
mingw: activate allocaks/tree-diff-nway
Both MSVC and MINGW have alloca(3) definitions in malloc.h, so by moving win32-compat alloca.h from compat/vcbuild/include/ to compat/win32/ , which is included by both MSVC and MINGW CFLAGS, we can make alloca() work on both those Windows environments. In MINGW, malloc.h has explicit check for GNUC and if it is so, defines alloca to __builtin_alloca, so it looks like we don't need to add any code to here-shipped alloca.h to get optimum performance. Compile-tested on Windows in MSysGit. Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions