Merge branch 'maint-1.7.6' into maint-1.7.7

[git.git] / compat / mingw.c

diff --git a/compat/mingw.c b/compat/mingw.c
index 8947418ce78faa3619779c12319c0dd99b1557d3..f899bf08394a9b4b940a311572ab0dc31bdf17de 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1705,7 +1705,7 @@ char *getpass(const char *prompt)
        return strbuf_detach(&buf, NULL);
 }
 
-pid_t waitpid(pid_t pid, int *status, unsigned options)
+pid_t waitpid(pid_t pid, int *status, int options)
 {
        HANDLE h = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
            FALSE, pid);