This macro is currently used only for stdcall functions. Rename it and includes STDCALL into the name to prevent confusion that it cannot be used for example for fastcall functions (they do not have leading underscore in name, like stdcall and cdecl). --- mingw-w64-crt/def-include/func.def.in | 3 +-- mingw-w64-crt/lib32/msvcr100.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr80.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr80d.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr90.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr90d.def.in | 4 ++-- mingw-w64-crt/lib32/msvcrt20.def.in | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/mingw-w64-crt/def-include/func.def.in b/mingw-w64-crt/def-include/func.def.in index 97d18e524d93..0d1ea7770d04 100644 --- a/mingw-w64-crt/def-include/func.def.in +++ b/mingw-w64-crt/def-include/func.def.in @@ -62,8 +62,7 @@ #endif #if defined(DEF_I386) -// for __cdecl and __stdcall only -#define DECORATED_EXPORT(symbol) symbol == _ ## symbol +#define STDCALL_DECORATED_EXPORT(symbol) symbol == _ ## symbol #endif #endif // FUNC_DEF_IN diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index caf7f3d83af3..d739ff1f932e 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -625,8 +625,8 @@ __daylight __dllonexit __doserrno __dstbias -DECORATED_EXPORT(__fls_getvalue@4) -DECORATED_EXPORT(__fls_setvalue@8) +STDCALL_DECORATED_EXPORT(__fls_getvalue@4) +STDCALL_DECORATED_EXPORT(__fls_setvalue@8) __fpecode __free_locale __get_current_locale diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index 72cc4cc37546..9d4e30ebe483 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -227,8 +227,8 @@ __daylight __dllonexit __doserrno __dstbias -DECORATED_EXPORT(__fls_getvalue@4) -DECORATED_EXPORT(__fls_setvalue@8) +STDCALL_DECORATED_EXPORT(__fls_getvalue@4) +STDCALL_DECORATED_EXPORT(__fls_setvalue@8) __fpecode __free_locale __get_app_type diff --git a/mingw-w64-crt/lib32/msvcr80d.def.in b/mingw-w64-crt/lib32/msvcr80d.def.in index adf1b8befce2..6bcbf03e9562 100644 --- a/mingw-w64-crt/lib32/msvcr80d.def.in +++ b/mingw-w64-crt/lib32/msvcr80d.def.in @@ -276,8 +276,8 @@ __daylight __dllonexit __doserrno __dstbias -DECORATED_EXPORT(__fls_getvalue@4) -DECORATED_EXPORT(__fls_setvalue@8) +STDCALL_DECORATED_EXPORT(__fls_getvalue@4) +STDCALL_DECORATED_EXPORT(__fls_setvalue@8) __fpecode __free_locale __get_app_type diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index f4f9807c18a5..5f15320b01aa 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -229,8 +229,8 @@ __daylight __dllonexit __doserrno __dstbias -DECORATED_EXPORT(__fls_getvalue@4) -DECORATED_EXPORT(__fls_setvalue@8) +STDCALL_DECORATED_EXPORT(__fls_getvalue@4) +STDCALL_DECORATED_EXPORT(__fls_setvalue@8) __fpecode __free_locale __get_app_type diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index a89a2d9d73e1..e03777630eb9 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -269,8 +269,8 @@ __daylight __dllonexit __doserrno __dstbias -DECORATED_EXPORT(__fls_getvalue@4) -DECORATED_EXPORT(__fls_setvalue@8) +STDCALL_DECORATED_EXPORT(__fls_getvalue@4) +STDCALL_DECORATED_EXPORT(__fls_setvalue@8) __fpecode __free_locale __get_app_type diff --git a/mingw-w64-crt/lib32/msvcrt20.def.in b/mingw-w64-crt/lib32/msvcrt20.def.in index 303514f1873b..fb193fa6b189 100644 --- a/mingw-w64-crt/lib32/msvcrt20.def.in +++ b/mingw-w64-crt/lib32/msvcrt20.def.in @@ -1164,7 +1164,7 @@ _rotl _rotr _scalb _searchenv -DECORATED_EXPORT(_seh_longjmp_unwind@4) +STDCALL_DECORATED_EXPORT(_seh_longjmp_unwind@4) _seterrormode _setjmp _setjmp3 -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
