aboutsummaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2011-12-08 20:39:57 +0100
committerJunio C Hamano <gitster@pobox.com>2011-12-09 10:46:52 -0800
commit956d86d1c9078eba380eb2530b0ff577a85c2e69 (patch)
tree7a5748a925bb5e8fa0c21ed392e70e9690eff48c /compat
parenta8d05d72b9fd60fe63f249250dcab2352b7b1984 (diff)
downloadgit-956d86d1c9078eba380eb2530b0ff577a85c2e69.tar.gz
git-956d86d1c9078eba380eb2530b0ff577a85c2e69.tar.xz
mingw: give waitpid the correct signature
POSIX says that last parameter to waitpid should be 'int', so let's make it so. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 8947418ce..f899bf083 100644
--- 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);
diff --git a/compat/mingw.h b/compat/mingw.h
index ce9dd980e..43e42f448 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);