Merge branch 'tr/maint-merge-ours-clarification' (early part)

diff --git a/run-command.h b/run-command.h
index 0c00b25ff2ea8710a1d963619d633a9be1a6f626..fb342090e3cac49f41689f9610bfe2d6c87c87c1 100644 (file)
--- 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;