summaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 13:30:20 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-11 13:30:20 -0700
commite936318aa61760a8fe02557bd3c241136613fb34 (patch)
tree0c6eba82cb2eecd1a462e702e93aa89b55370462 /help.c
parenta62d73e7c6fff96ea7fb2133b3e127a4a4bda957 (diff)
parent83ff1da3e81824eebf0425ad9200248ea7205c35 (diff)
downloadgit-e936318aa61760a8fe02557bd3c241136613fb34.tar.gz
Merge branch 'rj/mingw-cygwin'
Update build for Cygwin 1.[57]. Torsten Bögershausen reports that this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * rj/mingw-cygwin: cygwin: Remove the CYGWIN_V15_WIN32API build variable mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
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 bebfce96e6..08c54ef1c1 100644
--- a/help.c
+++ b/help.c
@@ -107,7 +107,7 @@ static int is_executable(const char *name)
!S_ISREG(st.st_mode))
return 0;
-#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__)
#if defined(__CYGWIN__)
if ((st.st_mode & S_IXUSR) == 0)
#endif