From d92d40ecd04798b7a31b9a5f38052d43c86e2ae0 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Tue, 18 Aug 2009 23:59:53 +0800 Subject: [PATCH] Place __stdcall between return value and function name MSVC requires that __stdcall be between return value and function name. Further, all Win32 API definitions look like this: TYPE WINAPI function_name... Signed-off-by: Frank Li Signed-off-by: Johannes Schindelin --- compat/mingw.c | 4 ++-- run-command.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 5d3d24617e..fd642e4309 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1271,7 +1271,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) @@ -1400,7 +1400,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 d0833f846e..62bea191d4 100644 --- a/run-command.c +++ b/run-command.c @@ -295,7 +295,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const } #ifdef WIN32 -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);