summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:34:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-09 13:34:18 -0800
commit51f737e350c79ddf45616fa023692fa557363434 (patch)
treed399f9592e1847372c87f91fbb62cec93b45092f /compat
parentMerge branch 'master' of git://bogomips.org/git-svn (diff)
parentMerge branch 'maint-1.7.7' into maint (diff)
downloadtgif-51f737e350c79ddf45616fa023692fa557363434.tar.xz
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')
-rw-r--r--compat/mingw.c2
-rw-r--r--compat/mingw.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index efdc703257..a0ac487c0c 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);
diff --git a/compat/mingw.h b/compat/mingw.h
index fecf0d0776..0ff1e04812 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -120,7 +120,7 @@ static inline int mingw_mkdir(const char *path, int mode)
#define mkdir mingw_mkdir
#define WNOHANG 1
-pid_t waitpid(pid_t pid, int *status, unsigned options);
+pid_t waitpid(pid_t pid, int *status, int options);
#define kill mingw_kill
int mingw_kill(pid_t pid, int sig);