summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-09 21:33:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-09 21:33:39 (GMT)
commit10dd3b2bf1444695416c0dac951297acf7d4e5e4 (patch)
treedfee18f87e5a8e382503931719b285d8a7a226ef /compat
parentb1af9630d758e1728fc0008b3f18d90d8f87f4c5 (diff)
parent791970425431878c8abe71645a03f0f64e20e461 (diff)
downloadgit-10dd3b2bf1444695416c0dac951297acf7d4e5e4.zip
git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.gz
git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.bz2
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: 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 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);
diff --git a/compat/mingw.h b/compat/mingw.h
index fecf0d0..0ff1e04 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);