mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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>
This commit is contained in:
parent
a6ca8c6246
commit
d7fa500fb5
|
@ -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(
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue