Skip to content

Commit

Permalink
mingw: give waitpid the correct signature
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Erik Faye-Lund authored and Junio C Hamano committed Dec 9, 2011
1 parent a8d05d7 commit 956d86d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion compat/mingw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion compat/mingw.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 956d86d

Please sign in to comment.