File tree Expand file tree Collapse file tree 2 files changed +20
-12
lines changed Expand file tree Collapse file tree 2 files changed +20
-12
lines changed Original file line number Diff line number Diff line change 82
82
#define __has_attribute (x ) 0
83
83
#endif
84
84
85
- #if !defined( _MSC_VER ) && !defined( __MINGW32__ )
85
+ #ifndef _MSC_VER
86
86
# undef __stdcall
87
87
# ifdef __i386__
88
88
# ifdef __GNUC__
100
100
# else
101
101
# define __stdcall __attribute__((ms_abi))
102
102
# endif
103
- # elif defined(__arm__ ) && defined (__GNUC__ ) && !defined(__SOFTFP__ ) && !defined(__CYGWIN__ )
103
+ # elif defined(__arm__ ) && defined (__GNUC__ ) && !defined(__SOFTFP__ ) && !defined(__MINGW32__ ) && !defined( __CYGWIN__ )
104
104
# define __stdcall __attribute__((pcs("aapcs-vfp")))
105
105
# elif defined(__aarch64__ ) && defined (__GNUC__ ) && __has_attribute (ms_abi )
106
106
# define __stdcall __attribute__((ms_abi))
107
107
# else /* __i386__ */
108
108
# define __stdcall
109
109
# endif /* __i386__ */
110
+ #endif /* __stdcall */
111
+
112
+ #ifndef _MSC_VER
110
113
# undef __cdecl
111
114
# if defined(__i386__ ) && defined(__GNUC__ )
112
115
# if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 2 )) || defined(__APPLE__ )
117
120
# else
118
121
# define __cdecl __stdcall
119
122
# endif
120
- #endif /* _MSC_VER || __MINGW32__ */
123
+ #endif
121
124
122
125
#if (defined(__x86_64__ ) || (defined(__aarch64__ ) && __has_attribute (ms_abi ))) && defined (__GNUC__ )
123
126
# include <stdarg.h>
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ extern "C" {
54
54
# endif
55
55
#endif
56
56
57
- #if !defined( _MSC_VER ) && !defined( __MINGW32__ )
57
+ #ifndef _MSC_VER
58
58
# undef __stdcall
59
59
# ifdef __i386__
60
60
# ifdef __GNUC__
@@ -72,13 +72,16 @@ extern "C" {
72
72
# else
73
73
# define __stdcall __attribute__((ms_abi))
74
74
# endif
75
- # elif defined(__arm__ ) && defined (__GNUC__ ) && !defined(__SOFTFP__ ) && !defined(__CYGWIN__ )
75
+ # elif defined(__arm__ ) && defined (__GNUC__ ) && !defined(__SOFTFP__ ) && !defined(__MINGW32__ ) && !defined( __CYGWIN__ )
76
76
# define __stdcall __attribute__((pcs("aapcs-vfp")))
77
77
# elif defined(__aarch64__ ) && defined (__GNUC__ ) && __has_attribute (ms_abi )
78
78
# define __stdcall __attribute__((ms_abi))
79
79
# else /* __i386__ */
80
80
# define __stdcall
81
81
# endif /* __i386__ */
82
+ #endif /* __stdcall */
83
+
84
+ #ifndef _MSC_VER
82
85
# undef __cdecl
83
86
# if defined(__i386__ ) && defined(__GNUC__ )
84
87
# if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 2 )) || defined(__APPLE__ )
@@ -89,13 +92,15 @@ extern "C" {
89
92
# else
90
93
# define __cdecl __stdcall
91
94
# endif
92
- # ifndef __fastcall
93
- # define __fastcall __stdcall
94
- # endif
95
- # ifndef __thiscall
96
- # define __thiscall __stdcall
97
- # endif
98
- #endif /* _MSC_VER || __MINGW32__ */
95
+ #endif
96
+
97
+ #if !defined(_MSC_VER ) && !defined(__fastcall )
98
+ # define __fastcall __stdcall
99
+ #endif
100
+
101
+ #if (!defined(_MSC_VER ) || !defined(__clang__ )) && !defined(__thiscall )
102
+ # define __thiscall __stdcall
103
+ #endif
99
104
100
105
#ifndef __ms_va_list
101
106
# if (defined(__x86_64__ ) || (defined(__aarch64__ ) && __has_attribute (ms_abi ))) && defined (__GNUC__ )
You can’t perform that action at this time.
0 commit comments