summaryrefslogtreecommitdiff
path: root/compat/mingw.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 21:34:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-09 21:34:18 (GMT)
commit51f737e350c79ddf45616fa023692fa557363434 (patch)
treed399f9592e1847372c87f91fbb62cec93b45092f /compat/mingw.c
parent4cb5d10b14dcbe0155bed9c45ccb94e83bd4c599 (diff)
parent10dd3b2bf1444695416c0dac951297acf7d4e5e4 (diff)
downloadgit-51f737e350c79ddf45616fa023692fa557363434.zip
git-51f737e350c79ddf45616fa023692fa557363434.tar.gz
git-51f737e350c79ddf45616fa023692fa557363434.tar.bz2
Merge branch 'maint'
* maint: am: don't persist keepcr flag mingw: give waitpid the correct signature git symbolic-ref: documentation fix
Diffstat (limited to 'compat/mingw.c')
-rw-r--r--compat/mingw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index efdc703..a0ac487 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1712,7 +1712,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);