Merge branch 'rj/maint-t9700' into maint

diff --git a/help.c b/help.c
index fd51b8e8ef748a146676de6192e0fb9170ed8836..e8db31f60f010887ccb3a943344da566e0937403 100644 (file)
--- 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;