Sync with maint

diff --git a/help.c b/help.c
index bebfce96e637fe2444fb8bd13f69c3d9cc147dd2..08c54ef1c1669edce960c52948b80340c36eb119 100644 (file)
--- 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