mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test for WIN32 instead of __MINGW32_

Browse Source 
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>
This commit is contained in:
Frank Li
2009-09-16 10:20:22 +02:00
committed by Junio C Hamano
parent d7fa500fb5
commit 71064e3f86
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
run-command.c
View File

@ -75,7 +75,7 @@ fail_pipe:
trace_argv_printf(cmd->argv, "trace: run_command:");
#ifndef __MINGW32__
#ifndef WIN32
fflush(NULL);
cmd->pid = fork();
if (!cmd->pid) {
@ -315,7 +315,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
return run_command(&cmd);
}
#ifdef __MINGW32__
#ifdef WIN32
static unsigned __stdcall run_thread(void *data)
{
struct async *async = data;
@ -331,7 +331,7 @@ int start_async(struct async *async)
return error("cannot create pipe: %s", strerror(errno));
async->out = pipe_out[0];
#ifndef __MINGW32__
#ifndef WIN32
/* Flush stdio before fork() to avoid cloning buffers */
fflush(NULL);
@ -360,7 +360,7 @@ int start_async(struct async *async)
int finish_async(struct async *async)
{
#ifndef __MINGW32__
#ifndef WIN32
int ret = wait_or_whine(async->pid, "child process", 0);
#else
DWORD ret = 0;