summaryrefslogtreecommitdiff
path: root/help.c
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 /help.c
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 'help.c')
-rw-r--r--help.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/help.c b/help.c
index fd51b8e..e8db31f 100644
--- a/help.c
+++ b/help.c
@@ -126,7 +126,7 @@ static int is_executable(const char *name)
!S_ISREG(st.st_mode))
return 0;
-#ifdef __MINGW32__
+#ifdef WIN32
{ /* cannot trust the executable bit, peek into the file instead */
char buf[3] = { 0 };
int n;