Module: wine Branch: master Commit: 6a704d6f724bf28b0f276ded0bf9855e2eff0494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a704d6f724bf28b0f276ded0b... Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 25 09:09:47 2008 +0100 includes: Add win64 calling convention. --- include/msvcrt/process.h | 6 ++++-- include/windef.h | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 92cbd22..c630671 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -41,9 +41,11 @@ typedef unsigned short wchar_t; # else # error You need to define __stdcall for your compiler # endif -# else /* __i386__ */ +# elif defined(__x86_64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) +# else # define __stdcall -# endif /* __i386__ */ +# endif #endif /* __stdcall */ #ifdef __cplusplus diff --git a/include/windef.h b/include/windef.h index fd3d423..8c0a0bb 100644 --- a/include/windef.h +++ b/include/windef.h @@ -62,6 +62,8 @@ extern "C" { # else # error You need to define __stdcall for your compiler # endif +# elif defined(__x86_64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -74,6 +76,8 @@ extern "C" { # else # define __cdecl __attribute__((__cdecl__)) # endif +# elif defined(__x86_64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif