From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Thu, 8 Dec 2011 19:39:57 +0000 (+0100)
Subject: mingw: give waitpid the correct signature
X-Git-Tag: v1.7.7.5~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=956d86d1c9078eba380eb2530b0ff577a85c2e69;p=git.git

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>
---

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);