Am 05.05.2014 23:29, schrieb André Hentschel:
> Please review, i'll commit it.
Again the right patch attached now, it's getting late, sorry.
Index: ddk/include/ddk/usbbusif.h
===================================================================
--- ddk/include/ddk/usbbusif.h (Revision 6609)
+++ ddk/include/ddk/usbbusif.h (Arbeitskopie)
@@ -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)
Index: ddk/include/ddk/bdasup.h
===================================================================
--- ddk/include/ddk/bdasup.h (Revision 6609)
+++ ddk/include/ddk/bdasup.h (Arbeitskopie)
@@ -6,7 +6,11 @@
extern "C" {
#endif
+#if defined(_ARM_)
+#define STDMETHODCALLTYPE
+#else
#define STDMETHODCALLTYPE __stdcall
+#endif
#ifndef _WDMDDK_
typedef GUID *PGUID;
Index: ddk/include/ddk/hubbusif.h
===================================================================
--- ddk/include/ddk/hubbusif.h (Revision 6609)
+++ ddk/include/ddk/hubbusif.h (Arbeitskopie)
@@ -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
Index: ddk/include/ddk/strmini.h
===================================================================
--- ddk/include/ddk/strmini.h (Revision 6609)
+++ ddk/include/ddk/strmini.h (Arbeitskopie)
@@ -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 {
Index: crt/intrin.h
===================================================================
--- crt/intrin.h (Revision 6609)
+++ crt/intrin.h (Arbeitskopie)
@@ -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)
Index: include/wincrypt.h
===================================================================
--- include/wincrypt.h (Revision 6609)
+++ include/wincrypt.h (Arbeitskopie)
@@ -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
Index: include/evntprov.h
===================================================================
--- include/evntprov.h (Revision 6609)
+++ include/evntprov.h (Arbeitskopie)
@@ -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 */
Index: include/odbcinst.h
===================================================================
--- include/odbcinst.h (Revision 6609)
+++ include/odbcinst.h (Arbeitskopie)
@@ -75,8 +75,12 @@
#ifndef RC_INVOKED
#ifndef WINAPI
+#if defined(_ARM_)
+#define WINAPI
+#else
#define WINAPI __stdcall
#endif
+#endif
#define INSTAPI WINAPI
Index: include/ncrypt.h
===================================================================
--- include/ncrypt.h (Revision 6609)
+++ include/ncrypt.h (Arbeitskopie)
@@ -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;
Index: include/sspi.h
===================================================================
--- include/sspi.h (Revision 6609)
+++ include/sspi.h (Arbeitskopie)
@@ -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
Index: include/comutil.h
===================================================================
--- include/comutil.h (Revision 6609)
+++ include/comutil.h (Arbeitskopie)
@@ -29,8 +29,12 @@
#undef new
#ifndef WINAPI
+#if defined(_ARM_)
+#define WINAPI
+#else
#define WINAPI __stdcall
#endif
+#endif
class _com_error;
Index: include/comdef.h
===================================================================
--- include/comdef.h (Revision 6609)
+++ include/comdef.h (Arbeitskopie)
@@ -19,8 +19,12 @@
#include <comutil.h>
#ifndef WINAPI
+#if defined(_ARM_)
+#define WINAPI
+#else
#define WINAPI __stdcall
#endif
+#endif
#ifdef __cplusplus
Index: include/evntrace.h
===================================================================
--- include/evntrace.h (Revision 6609)
+++ include/evntrace.h (Arbeitskopie)
@@ -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 */
Index: include/minwindef.h
===================================================================
--- include/minwindef.h (Revision 6609)
+++ include/minwindef.h (Arbeitskopie)
@@ -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
Index: include/ntdef.h
===================================================================
--- include/ntdef.h (Revision 6609)
+++ include/ntdef.h (Arbeitskopie)
@@ -182,7 +182,11 @@
#define FASTCALL
#endif
+#if defined(_ARM_)
+#define NTAPI
+#else
#define NTAPI __stdcall
+#endif
#ifndef NOP_FUNCTION
Index: include/rpc.h
===================================================================
--- include/rpc.h (Revision 6609)
+++ include/rpc.h (Arbeitskopie)
@@ -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
Index: include/strsafe.h
===================================================================
--- include/strsafe.h (Revision 6609)
+++ include/strsafe.h (Arbeitskopie)
@@ -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
Index: include/sqltypes.h
===================================================================
--- include/sqltypes.h (Revision 6609)
+++ include/sqltypes.h (Arbeitskopie)
@@ -18,7 +18,11 @@
#define EXPORT
#endif
+#if defined(_ARM_)
+#define SQL_API
+#else
#define SQL_API __stdcall
+#endif
#ifndef RC_INVOKED
Index: include/comip.h
===================================================================
--- include/comip.h (Revision 6609)
+++ include/comip.h (Arbeitskopie)
@@ -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;
Index: include/gdiplus/gdiplustypes.h
===================================================================
--- include/gdiplus/gdiplustypes.h (Revision 6609)
+++ include/gdiplus/gdiplustypes.h (Arbeitskopie)
@@ -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 {
Index: include/bcrypt.h
===================================================================
--- include/bcrypt.h (Revision 6609)
+++ include/bcrypt.h (Arbeitskopie)
@@ -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
Index: include/dhcpsapi.h
===================================================================
--- include/dhcpsapi.h (Revision 6609)
+++ include/dhcpsapi.h (Arbeitskopie)
@@ -7,8 +7,12 @@
#define _DHCPSAPI_
#ifndef WINAPI
+#if defined(_ARM_)
+#define WINAPI
+#else
#define WINAPI __stdcall
#endif
+#endif
#define DHCP_API_FUNCTION WINAPI
Index: include/mdbrole.hxx
===================================================================
--- include/mdbrole.hxx (Revision 6609)
+++ include/mdbrole.hxx (Arbeitskopie)
@@ -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
Index: include/lpmapi.h
===================================================================
--- include/lpmapi.h (Revision 6609)
+++ include/lpmapi.h (Arbeitskopie)
@@ -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
Index: include/mapinls.h
===================================================================
--- include/mapinls.h (Revision 6609)
+++ include/mapinls.h (Arbeitskopie)
@@ -11,8 +11,12 @@
#endif
#ifndef WINAPI
+#if defined(_ARM_)
+#define WINAPI
+#else
#define WINAPI __stdcall
#endif
+#endif
#ifdef DOS
#include <string.h>
Index: include/loadperf.h
===================================================================
--- include/loadperf.h (Revision 6609)
+++ include/loadperf.h (Arbeitskopie)
@@ -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
Index: include/traffic.h
===================================================================
--- include/traffic.h (Revision 6609)
+++ include/traffic.h (Arbeitskopie)
@@ -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
Index: include/dxvahd.h
===================================================================
--- include/dxvahd.h (Revision 6609)
+++ include/dxvahd.h (Arbeitskopie)
@@ -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;
Index: include/msasn1.h
===================================================================
--- include/msasn1.h (Revision 6609)
+++ include/msasn1.h (Arbeitskopie)
@@ -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
Index: include/invkprxy.h
===================================================================
--- include/invkprxy.h (Revision 6609)
+++ include/invkprxy.h (Arbeitskopie)
@@ -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);
Index: include/filehc.h
===================================================================
--- include/filehc.h (Revision 6609)
+++ include/filehc.h (Arbeitskopie)
@@ -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)
Index: include/psdk_inc/_dbg_LOAD_IMAGE.h
===================================================================
--- include/psdk_inc/_dbg_LOAD_IMAGE.h (Revision 6609)
+++ include/psdk_inc/_dbg_LOAD_IMAGE.h (Arbeitskopie)
@@ -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)
Index: include/rpcndr.h
===================================================================
--- include/rpcndr.h (Revision 6609)
+++ include/rpcndr.h (Arbeitskopie)
@@ -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
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
