From: Marius Storm-Olsen <mstormo@gmail.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, msysgit@googlegroups.com,
gitster@pobox.com, j6t@kdbg.org, lznuaa@gmail.com,
raa.lkml@gmail.com, snaury@gmail.com,
Marius Storm-Olsen <mstormo@gmail.com>
Subject: [PATCH 05/15] Fix __stdcall placement and function prototype
Date: Wed, 16 Sep 2009 10:20:21 +0200 [thread overview]
Message-ID: <eec2b652c5a8e3e21348a8211d336fce66cb21a5.1253088099.git.mstormo@gmail.com> (raw)
In-Reply-To: <929c5a34cd2621af24bcda7e47ff2e76b51c2e09.1253088099.git.mstormo@gmail.com>
In-Reply-To: <cover.1253088099.git.mstormo@gmail.com>
From: Frank Li <lznuaa@gmail.com>
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>
---
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 5a8fae8..34ee427 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 02aaedf..bb76750 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);
--
1.6.2.1.418.g33d56.dirty
next prev parent reply other threads:[~2009-09-16 8:21 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 8:20 [PATCH v4 00/15] Build Git with MSVC Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 01/15] Avoid declaration after statement Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 02/15] Add define guards to compat/win32.h Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 03/15] Change regerror() declaration from K&R style to ANSI C (C89) Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 04/15] Set _O_BINARY as default fmode for both MinGW and MSVC Marius Storm-Olsen
2009-09-16 8:20 ` Marius Storm-Olsen [this message]
2009-09-16 8:20 ` [PATCH 06/15] Test for WIN32 instead of __MINGW32_ Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 07/15] Add empty header files for MSVC port Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 08/15] Add MinGW header files to build git with MSVC Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 09/15] Add platform files for MSVC porting Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 10/15] Make usage of windows.h lean and mean Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 11/15] Define strncasecmp and ftruncate for MSVC Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 12/15] Add MSVC to Makefile Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 13/15] Add README for MSVC build Marius Storm-Olsen
2009-09-16 8:20 ` [PATCH 14/15] Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake) Marius Storm-Olsen
2009-09-16 8:20 ` [RFC 15/15] Tag GIT_VERSION when Git is built with MSVC Marius Storm-Olsen
2009-09-17 20:18 ` Johannes Sixt
2009-09-18 6:44 ` Marius Storm-Olsen
2009-09-17 20:28 ` [PATCH 14/15] Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake) Johannes Sixt
2009-09-18 6:59 ` Marius Storm-Olsen
2009-09-18 8:21 ` Johannes Sixt
2009-09-23 15:04 ` Sebastian Schuberth
2009-09-23 20:37 ` Johannes Schindelin
2009-09-24 6:05 ` Marius Storm-Olsen
2009-09-23 10:03 ` Add MinGW header files to build git with MSVC Sebastian Schuberth
2009-09-23 11:29 ` Marius Storm-Olsen
2009-09-25 0:18 ` [msysGit] " Frank Li
2009-09-16 16:14 ` [PATCH 04/15] Set _O_BINARY as default fmode for both MinGW and MSVC Johannes Sixt
2009-09-16 20:00 ` Alexey Borzenkov
2009-09-17 7:11 ` Johannes Sixt
2009-09-17 7:25 ` Junio C Hamano
2009-09-17 7:27 ` Marius Storm-Olsen
2009-09-17 7:36 ` Johannes Sixt
2009-09-17 7:53 ` Marius Storm-Olsen
2009-09-17 8:10 ` Johannes Sixt
2009-09-17 8:14 ` Marius Storm-Olsen
2009-09-17 8:39 ` Alexey Borzenkov
2009-09-17 8:45 ` Marius Storm-Olsen
2009-09-17 8:57 ` Alexey Borzenkov
2009-09-17 9:03 ` Johannes Sixt
2009-09-17 9:28 ` Marius Storm-Olsen
2009-09-17 13:02 ` Alexey Borzenkov
2009-09-17 13:30 ` Johannes Sixt
2009-09-17 8:02 ` Marius Storm-Olsen
2009-09-17 10:44 ` Johannes Sixt
[not found] ` <4AB212FA.9080102@viscovery.netm>
2009-09-17 11:04 ` Marius Storm-Olsen
2009-09-16 9:42 ` [msysGit] [PATCH 02/15] Add define guards to compat/win32.h Erik Faye-Lund
2009-09-16 10:10 ` Marius Storm-Olsen
2009-09-23 9:44 ` Avoid declaration after statement Sebastian Schuberth
2009-09-25 13:34 ` Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eec2b652c5a8e3e21348a8211d336fce66cb21a5.1253088099.git.mstormo@gmail.com \
--to=mstormo@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=lznuaa@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=raa.lkml@gmail.com \
--cc=snaury@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).