From: <daw...@us...> - 2014-05-05 22:01:54
|
Revision: 6610 http://sourceforge.net/p/mingw-w64/code/6610 Author: dawncrow Date: 2014-05-05 22:01:44 +0000 (Mon, 05 May 2014) Log Message: ----------- Don't use __stdcall on ARM Modified Paths: -------------- trunk/mingw-w64-headers/crt/intrin.h trunk/mingw-w64-headers/ddk/include/ddk/bdasup.h trunk/mingw-w64-headers/ddk/include/ddk/hubbusif.h trunk/mingw-w64-headers/ddk/include/ddk/strmini.h trunk/mingw-w64-headers/ddk/include/ddk/usbbusif.h trunk/mingw-w64-headers/include/bcrypt.h trunk/mingw-w64-headers/include/comdef.h trunk/mingw-w64-headers/include/comip.h trunk/mingw-w64-headers/include/comutil.h trunk/mingw-w64-headers/include/dhcpsapi.h trunk/mingw-w64-headers/include/dxvahd.h trunk/mingw-w64-headers/include/evntprov.h trunk/mingw-w64-headers/include/evntrace.h trunk/mingw-w64-headers/include/filehc.h trunk/mingw-w64-headers/include/gdiplus/gdiplustypes.h trunk/mingw-w64-headers/include/invkprxy.h trunk/mingw-w64-headers/include/loadperf.h trunk/mingw-w64-headers/include/lpmapi.h trunk/mingw-w64-headers/include/mapinls.h trunk/mingw-w64-headers/include/mdbrole.hxx trunk/mingw-w64-headers/include/minwindef.h trunk/mingw-w64-headers/include/msasn1.h trunk/mingw-w64-headers/include/ncrypt.h trunk/mingw-w64-headers/include/ntdef.h trunk/mingw-w64-headers/include/odbcinst.h trunk/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h trunk/mingw-w64-headers/include/rpc.h trunk/mingw-w64-headers/include/rpcndr.h trunk/mingw-w64-headers/include/sqltypes.h trunk/mingw-w64-headers/include/sspi.h trunk/mingw-w64-headers/include/strsafe.h trunk/mingw-w64-headers/include/traffic.h trunk/mingw-w64-headers/include/wincrypt.h Modified: trunk/mingw-w64-headers/crt/intrin.h =================================================================== --- trunk/mingw-w64-headers/crt/intrin.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/crt/intrin.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -92,8 +92,12 @@ #endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #if defined(__MMX__) || defined(__MINGW_FORCE_SYS_INTRINS) #if defined(__cplusplus) Modified: trunk/mingw-w64-headers/ddk/include/ddk/bdasup.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/bdasup.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/ddk/include/ddk/bdasup.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -6,7 +6,11 @@ extern "C" { #endif +#if defined(_ARM_) +#define STDMETHODCALLTYPE +#else #define STDMETHODCALLTYPE __stdcall +#endif #ifndef _WDMDDK_ typedef GUID *PGUID; Modified: trunk/mingw-w64-headers/ddk/include/ddk/hubbusif.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/hubbusif.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/ddk/include/ddk/hubbusif.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -19,8 +19,12 @@ #define USBD_DEVHACK_SET_DIAG_ID 0x00000004 #ifndef USB_BUSIFFN +#if defined(_ARM_) +#define USB_BUSIFFN +#else #define USB_BUSIFFN __stdcall #endif +#endif #define CD_ERR_V1 0x00000001 Modified: trunk/mingw-w64-headers/ddk/include/ddk/strmini.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/strmini.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/ddk/include/ddk/strmini.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -5,7 +5,12 @@ #include <windef.h> #include <ks.h> +#if defined(_ARM_) +#define STREAMAPI +#else #define STREAMAPI __stdcall +#endif + #define STREAM_SYSTEM_TIME_MASK ((STREAM_SYSTEM_TIME)0x00000001FFFFFFFF) typedef enum { Modified: trunk/mingw-w64-headers/ddk/include/ddk/usbbusif.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/usbbusif.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/ddk/include/ddk/usbbusif.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -3,8 +3,12 @@ #define _USBBUSIF_ #ifndef USB_BUSIFFN +#if defined(_ARM_) +#define USB_BUSIFFN +#else #define USB_BUSIFFN __stdcall #endif +#endif #if (NTDDI_VERSION >= NTDDI_WINXP) Modified: trunk/mingw-w64-headers/include/bcrypt.h =================================================================== --- trunk/mingw-w64-headers/include/bcrypt.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/bcrypt.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -15,8 +15,12 @@ #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #if !defined (_NTDEF_) && !defined (_NTSTATUS_PSDK) #define _NTSTATUS_PSDK Modified: trunk/mingw-w64-headers/include/comdef.h =================================================================== --- trunk/mingw-w64-headers/include/comdef.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/comdef.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -19,8 +19,12 @@ #include <comutil.h> #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifdef __cplusplus Modified: trunk/mingw-w64-headers/include/comip.h =================================================================== --- trunk/mingw-w64-headers/include/comip.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/comip.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -23,8 +23,12 @@ class _com_error; #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif void WINAPI _com_issue_error(HRESULT); struct IUnknown; Modified: trunk/mingw-w64-headers/include/comutil.h =================================================================== --- trunk/mingw-w64-headers/include/comutil.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/comutil.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -29,8 +29,12 @@ #undef new #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif class _com_error; Modified: trunk/mingw-w64-headers/include/dhcpsapi.h =================================================================== --- trunk/mingw-w64-headers/include/dhcpsapi.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/dhcpsapi.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -7,8 +7,12 @@ #define _DHCPSAPI_ #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define DHCP_API_FUNCTION WINAPI Modified: trunk/mingw-w64-headers/include/dxvahd.h =================================================================== --- trunk/mingw-w64-headers/include/dxvahd.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/dxvahd.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -11,8 +11,12 @@ #endif #ifndef CALLBACK +#if defined(_ARM_) +#define CALLBACK +#else #define CALLBACK __stdcall #endif +#endif typedef struct IDXVAHD_Device IDXVAHD_Device; typedef struct IDXVAHD_VideoProcessor IDXVAHD_VideoProcessor; Modified: trunk/mingw-w64-headers/include/evntprov.h =================================================================== --- trunk/mingw-w64-headers/include/evntprov.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/evntprov.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -24,9 +24,17 @@ #ifndef EVNTAPI #ifndef MIDL_PASS #ifdef _EVNT_SOURCE_ +#if defined(_ARM_) +#define EVNTAPI +#else #define EVNTAPI __stdcall +#endif #else +#if defined(_ARM_) +#define EVNTAPI DECLSPEC_IMPORT +#else #define EVNTAPI DECLSPEC_IMPORT __stdcall +#endif #endif /* _EVNT_SOURCE_ */ #endif /* MIDL_PASS */ #endif /* EVNTAPI */ Modified: trunk/mingw-w64-headers/include/evntrace.h =================================================================== --- trunk/mingw-w64-headers/include/evntrace.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/evntrace.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -11,10 +11,18 @@ #ifndef WMIAPI #ifndef MIDL_PASS #ifdef _WMI_SOURCE_ +#if defined(_ARM_) +#define WMIAPI +#else #define WMIAPI __stdcall +#endif #else +#if defined(_ARM_) +#define WMIAPI DECLSPEC_IMPORT +#else #define WMIAPI DECLSPEC_IMPORT __stdcall #endif +#endif #endif /* MIDL_PASS */ #endif /* WMIAPI */ Modified: trunk/mingw-w64-headers/include/filehc.h =================================================================== --- trunk/mingw-w64-headers/include/filehc.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/filehc.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -38,8 +38,12 @@ typedef FIO_CONTEXT *PFIO_CONTEXT; #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define FILEHC_EXPORT __declspec(dllimport) Modified: trunk/mingw-w64-headers/include/gdiplus/gdiplustypes.h =================================================================== --- trunk/mingw-w64-headers/include/gdiplus/gdiplustypes.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/gdiplus/gdiplustypes.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -26,7 +26,11 @@ #pragma GCC system_header #endif +#if defined(_ARM_) +#define WINGDIPAPI +#else #define WINGDIPAPI __stdcall +#endif #define GDIPCONST const typedef enum GpStatus { Modified: trunk/mingw-w64-headers/include/invkprxy.h =================================================================== --- trunk/mingw-w64-headers/include/invkprxy.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/invkprxy.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -7,8 +7,12 @@ #define _INC_INVKPRXY 1 #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif HRESULT WINAPI _com_handle_excepinfo(EXCEPINFO& excepInfo,IErrorInfo **pperrinfo); HRESULT __cdecl _com_invoke_helper(IDispatch *pDispatch,DISPID dwDispID,WORD wFlags,VARTYPE vtRet,void *pvRet,const wchar_t *pwParamInfo,va_list argList,IErrorInfo **pperrinfo); Modified: trunk/mingw-w64-headers/include/loadperf.h =================================================================== --- trunk/mingw-w64-headers/include/loadperf.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/loadperf.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -13,8 +13,12 @@ #endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define LOADPERF_FUNCTION __declspec(dllimport) DWORD WINAPI Modified: trunk/mingw-w64-headers/include/lpmapi.h =================================================================== --- trunk/mingw-w64-headers/include/lpmapi.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/lpmapi.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -11,12 +11,20 @@ #endif #ifndef CALLBACK +#if defined(_ARM_) +#define CALLBACK +#else #define CALLBACK __stdcall #endif +#endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifndef APIENTRY #define APIENTRY WINAPI Modified: trunk/mingw-w64-headers/include/mapinls.h =================================================================== --- trunk/mingw-w64-headers/include/mapinls.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/mapinls.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -11,8 +11,12 @@ #endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifdef DOS #include <string.h> Modified: trunk/mingw-w64-headers/include/mdbrole.hxx =================================================================== --- trunk/mingw-w64-headers/include/mdbrole.hxx 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/mdbrole.hxx 2014-05-05 22:01:44 UTC (rev 6610) @@ -7,8 +7,12 @@ #define _MDBROLE_HXX_ #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifdef FASTCALL_IN_STORE #define __FORCENONFASTCALL WINAPI Modified: trunk/mingw-w64-headers/include/minwindef.h =================================================================== --- trunk/mingw-w64-headers/include/minwindef.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/minwindef.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -72,7 +72,11 @@ #define far #define near +#if defined(_ARM_) +#define pascal +#else #define pascal __stdcall +#endif #define cdecl #ifndef CDECL @@ -80,17 +84,30 @@ #endif #ifndef CALLBACK +#if defined(_ARM_) +#define CALLBACK +#else #define CALLBACK __stdcall #endif +#endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define WINAPIV __cdecl #define APIENTRY WINAPI +#if defined(_ARM_) +#define APIPRIVATE +#define PASCAL +#else #define APIPRIVATE __stdcall #define PASCAL __stdcall +#endif #ifndef WINAPI_INLINE #define WINAPI_INLINE WINAPI Modified: trunk/mingw-w64-headers/include/msasn1.h =================================================================== --- trunk/mingw-w64-headers/include/msasn1.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/msasn1.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -20,8 +20,12 @@ typedef signed __LONG32 ASN1int32_t; #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define ASN1_PUBLIC __declspec(dllimport) #define ASN1API WINAPI Modified: trunk/mingw-w64-headers/include/ncrypt.h =================================================================== --- trunk/mingw-w64-headers/include/ncrypt.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/ncrypt.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -12,8 +12,12 @@ #endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifndef __SECSTATUS_DEFINED__ typedef LONG SECURITY_STATUS; Modified: trunk/mingw-w64-headers/include/ntdef.h =================================================================== --- trunk/mingw-w64-headers/include/ntdef.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/ntdef.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -182,7 +182,11 @@ #define FASTCALL #endif +#if defined(_ARM_) +#define NTAPI +#else #define NTAPI __stdcall +#endif #ifndef NOP_FUNCTION Modified: trunk/mingw-w64-headers/include/odbcinst.h =================================================================== --- trunk/mingw-w64-headers/include/odbcinst.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/odbcinst.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -75,8 +75,12 @@ #ifndef RC_INVOKED #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define INSTAPI WINAPI Modified: trunk/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h =================================================================== --- trunk/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -6,8 +6,12 @@ #pragma once #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define IMAGEAPI DECLSPEC_IMPORT WINAPI #define DBHLP_DEPRECIATED __declspec(deprecated) Modified: trunk/mingw-w64-headers/include/rpc.h =================================================================== --- trunk/mingw-w64-headers/include/rpc.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/rpc.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -50,7 +50,11 @@ #define RPC_UNICODE_SUPPORTED #define __RPC_FAR +#if defined(_ARM_) +#define __RPC_API +#else #define __RPC_API __stdcall +#endif #define __RPC_USER __RPC_API #define __RPC_STUB __RPC_API #define RPC_ENTRY __RPC_API Modified: trunk/mingw-w64-headers/include/rpcndr.h =================================================================== --- trunk/mingw-w64-headers/include/rpcndr.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/rpcndr.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -96,8 +96,12 @@ #endif #ifdef __RPC_WIN32__ +#if defined(_ARM_) +#define __RPC_CALLEE +#else #define __RPC_CALLEE __stdcall #endif +#endif #ifndef __MIDL_USER_DEFINED #define __MIDL_USER_DEFINED Modified: trunk/mingw-w64-headers/include/sqltypes.h =================================================================== --- trunk/mingw-w64-headers/include/sqltypes.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/sqltypes.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -18,7 +18,11 @@ #define EXPORT #endif +#if defined(_ARM_) +#define SQL_API +#else #define SQL_API __stdcall +#endif #ifndef RC_INVOKED Modified: trunk/mingw-w64-headers/include/sspi.h =================================================================== --- trunk/mingw-w64-headers/include/sspi.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/sspi.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -54,8 +54,12 @@ #endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #define SEC_TEXT TEXT #define SEC_FAR Modified: trunk/mingw-w64-headers/include/strsafe.h =================================================================== --- trunk/mingw-w64-headers/include/strsafe.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/strsafe.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -74,8 +74,12 @@ #endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifndef __CRT_STRSAFE_IMPL #define STRSAFEAPI _STRSAFE_EXTERN_C __inline HRESULT WINAPI Modified: trunk/mingw-w64-headers/include/traffic.h =================================================================== --- trunk/mingw-w64-headers/include/traffic.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/traffic.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -25,12 +25,20 @@ #define MAX_STRING_LENGTH 256 #ifndef CALLBACK +#if defined(_ARM_) +#define CALLBACK +#else #define CALLBACK __stdcall #endif +#endif #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifndef APIENTRY #define APIENTRY WINAPI Modified: trunk/mingw-w64-headers/include/wincrypt.h =================================================================== --- trunk/mingw-w64-headers/include/wincrypt.h 2014-05-05 20:50:54 UTC (rev 6609) +++ trunk/mingw-w64-headers/include/wincrypt.h 2014-05-05 22:01:44 UTC (rev 6610) @@ -37,12 +37,20 @@ #include <apisetcconv.h> #ifndef WINAPI +#if defined(_ARM_) +#define WINAPI +#else #define WINAPI __stdcall #endif +#endif #ifndef CALLBACK +#if defined(_ARM_) +#define CALLBACK +#else #define CALLBACK __stdcall #endif +#endif #ifndef CONST #define CONST const This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |