diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 22:33:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 22:33:39 +0100 |
| commit | 10dd3b2bf1444695416c0dac951297acf7d4e5e4 (patch) | |
| tree | dfee18f87e5a8e382503931719b285d8a7a226ef /compat/mingw.h | |
| parent | Merge branch 'maint-1.7.7' into maint (diff) | |
| parent | am: don't persist keepcr flag (diff) | |
| download | git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.tar.xz git-10dd3b2bf1444695416c0dac951297acf7d4e5e4.zip | |
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/mingw.h')
| -rw-r--r-- | compat/mingw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index fecf0d0776..0ff1e04812 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); |