summaryrefslogtreecommitdiff
path: root/compat/mingw.h
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2012-04-05 18:48:46 +0100
committerJunio C Hamano <gitster@pobox.com>2012-04-05 16:22:48 -0700
commit1696d72321492c05bebd1e823de0708c13ec7d72 (patch)
tree6621bb4ea1ed488c81665975dc21ff454a501b2d /compat/mingw.h
parent828ea97de486c1693d6e4f2c7347acb50235a85d (diff)
downloadgit-1696d72321492c05bebd1e823de0708c13ec7d72.tar.gz
compat/mingw.[ch]: Change return type of exec functions to int
The POSIX standard specifies a return type of int for all six exec functions. In addition, all exec functions return -1 on error, and simply do not return on success. However, the current emulation of the exec functions on mingw are declared with a void return type. This would cause a problem should any code attempt to call the exec function in a non-void context. In particular, if an exec function were used in a conditional it would fail to compile. In order to improve the fidelity of the emulation, we change the return type of the mingw_execv[p] functions to int and return -1 on error. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.h')
-rw-r--r--compat/mingw.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index 0ff1e04812..ef5b15014e 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -274,9 +274,9 @@ int mingw_utime(const char *file_name, const struct utimbuf *times);
pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
const char *dir,
int fhin, int fhout, int fherr);
-void mingw_execvp(const char *cmd, char *const *argv);
+int mingw_execvp(const char *cmd, char *const *argv);
#define execvp mingw_execvp
-void mingw_execv(const char *cmd, char *const *argv);
+int mingw_execv(const char *cmd, char *const *argv);
#define execv mingw_execv
static inline unsigned int git_ntohl(unsigned int x)