mingw: give waitpid the correct signature
authorErik Faye-Lund <kusmabite@gmail.com>
Thu, 8 Dec 2011 19:39:57 +0000 (20:39 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 18:46:52 +0000 (10:46 -0800)
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>
compat/mingw.c
compat/mingw.h
index 8947418ce78faa3619779c12319c0dd99b1557d3..f899bf08394a9b4b940a311572ab0dc31bdf17de 100644 (file)
@@ -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);
index ce9dd980eb211c0301c4008249c61fb0b09f1280..43e42f4481a371af5f886bdb0ce1cc789dfdb82e 100644 (file)
@@ -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);