diff options
| author | Frank Li <lznuaa@gmail.com> | 2009-09-16 10:20:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-18 20:00:42 -0700 |
| commit | d7fa500fb598d725bda3427535e87f06caf93ee8 (patch) | |
| tree | 763fd4ec5dff827dd9248c4619e6840769f16773 | |
| parent | a6ca8c62467570d5d227eba4f2b838ce4b9940e8 (diff) | |
| download | git-d7fa500fb598d725bda3427535e87f06caf93ee8.tar.gz | |
Fix __stdcall placement and function prototype
MSVC requires __stdcall to be between the functions return value and the
function name, and that the function pointer type is in the form of
return_type (WINAPI *function_name)(arguments...)
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.c | 4 | ||||
| -rw-r--r-- | run-command.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 5a8fae8b31..34ee427baf 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1027,7 +1027,7 @@ static sig_handler_t timer_fn = SIG_DFL; * length to call the signal handler. */ -static __stdcall unsigned ticktack(void *dummy) +static unsigned __stdcall ticktack(void *dummy) { while (WaitForSingleObject(timer_event, timer_interval) == WAIT_TIMEOUT) { if (timer_fn == SIG_DFL) @@ -1154,7 +1154,7 @@ void mingw_open_html(const char *unixpath) int link(const char *oldpath, const char *newpath) { - typedef BOOL WINAPI (*T)(const char*, const char*, LPSECURITY_ATTRIBUTES); + typedef BOOL (WINAPI *T)(const char*, const char*, LPSECURITY_ATTRIBUTES); static T create_hard_link = NULL; if (!create_hard_link) { create_hard_link = (T) GetProcAddress( diff --git a/run-command.c b/run-command.c index 02aaedfb8c..bb76750cd0 100644 --- a/run-command.c +++ b/run-command.c @@ -316,7 +316,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const } #ifdef __MINGW32__ -static __stdcall unsigned run_thread(void *data) +static unsigned __stdcall run_thread(void *data) { struct async *async = data; return async->proc(async->fd_for_proc, async->data); |