summaryrefslogtreecommitdiff
path: root/run-command.h
diff options
context:
space:
mode:
authorFrank Li <lznuaa@gmail.com>2009-09-16 08:20:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-09-19 03:00:42 (GMT)
commit71064e3f86fbf2eb5c2b55a3024051f9542ae229 (patch)
tree9287bbdfe8a2196470fa7d5647f65baf82d6bbc9 /run-command.h
parentd7fa500fb598d725bda3427535e87f06caf93ee8 (diff)
downloadgit-71064e3f86fbf2eb5c2b55a3024051f9542ae229.zip
git-71064e3f86fbf2eb5c2b55a3024051f9542ae229.tar.gz
git-71064e3f86fbf2eb5c2b55a3024051f9542ae229.tar.bz2
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 'run-command.h')
-rw-r--r--run-command.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/run-command.h b/run-command.h
index 0c00b25..fb34209 100644
--- a/run-command.h
+++ b/run-command.h
@@ -70,7 +70,7 @@ struct async {
int (*proc)(int fd, void *data);
void *data;
int out; /* caller reads from here and closes it */
-#ifndef __MINGW32__
+#ifndef WIN32
pid_t pid;
#else
HANDLE tid;