Define _atoi64 and _atoi64_l aliases based on a new WITH_ATOLL_ALIAS and WITH_ATOLL_L_ALIAS macros. --- mingw-w64-crt/def-include/msvcrt-common.def.in | 8 ++++++++ mingw-w64-crt/lib-common/msvcrt.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr100.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr110.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr70.def.in | 2 +- mingw-w64-crt/lib32/msvcr71.def.in | 2 +- mingw-w64-crt/lib32/msvcr80.def.in | 3 ++- mingw-w64-crt/lib32/msvcr90.def.in | 4 ++-- mingw-w64-crt/lib32/msvcr90d.def.in | 4 ++-- mingw-w64-crt/lib64/msvcr100.def.in | 4 ++-- mingw-w64-crt/lib64/msvcr110.def.in | 4 ++-- mingw-w64-crt/lib64/msvcr80.def.in | 3 ++- mingw-w64-crt/lib64/msvcr90.def.in | 4 ++-- mingw-w64-crt/lib64/msvcr90d.def.in | 4 ++-- 14 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index 6d91e760bfae..ea05823f0829 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -164,6 +164,14 @@ ADD_UNDERSCORE(vsnprintf_s) _strcmpi == _stricmp #endif +#ifdef WITH_ATOLL_ALIAS +atoll == _atoi64 +#endif + +#ifdef WITH_ATOLL_L_ALIAS +_atoll_l == _atoi64_l +#endif + ; This is list of printf/scanf symbol aliases with __ms_ prefix #ifndef UCRTBASE __ms_fprintf == fprintf diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in index 899a428be650..5b383dba4e52 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -3,6 +3,8 @@ EXPORTS #define PRE_C95_SWPRINTF #define NO_STRCMPI_ALIAS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "func.def.in" #include "msvcrt-common.def.in" @@ -1844,12 +1846,10 @@ F32(_wstat32 == _wstat) F64(_wstat64i32 == _wstat) ; This is list of some symbols added in msvcr120.dll which can be defined as aliases to some msvcrt.dll symbols -_atoll_l == _atoi64_l _strtoimax_l == _strtoi64_l _strtoll_l == _strtoi64_l _strtoull_l == _strtoui64_l _strtoumax_l == _strtoui64_l -atoll == _atoi64 F_NON_I386(imaxabs == _abs64) ; i386 imaxabs alias provided by emu F_NON_I386(llabs == _abs64) ; i386 llabs alias provided by emu F_NON_I386(strtoimax == _strtoi64) ; i386 strtoimax alias provided by emu diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index 1c9e79a9b029..5cd2bc809d12 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -6,6 +6,8 @@ LIBRARY "msvcr100.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Concurrency::details::<0x1ULL>::<0x1ULL>(void(__cdecl *)(void)) @@ -738,9 +740,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in index a40be8f1c0f4..4c714b7e5230 100644 --- a/mingw-w64-crt/lib32/msvcr110.def.in +++ b/mingw-w64-crt/lib32/msvcr110.def.in @@ -6,6 +6,8 @@ LIBRARY "MSVCR110.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Concurrency::details::<0x1ULL>::<0x1ULL>(void(__cdecl *)(void)) @@ -862,9 +864,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib32/msvcr70.def.in b/mingw-w64-crt/lib32/msvcr70.def.in index 49c4a6893577..266643b4d015 100644 --- a/mingw-w64-crt/lib32/msvcr70.def.in +++ b/mingw-w64-crt/lib32/msvcr70.def.in @@ -8,6 +8,7 @@ EXPORTS #define PRE_C95_SWPRINTF #define NO_STRCMPI_ALIAS +#define WITH_ATOLL_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) @@ -265,7 +266,6 @@ _amsg_exit _assert _atodbl _atoi64 -atoll == _atoi64 _atoldbl _beep _beginthread diff --git a/mingw-w64-crt/lib32/msvcr71.def.in b/mingw-w64-crt/lib32/msvcr71.def.in index 6b667725b86e..000a1263b580 100644 --- a/mingw-w64-crt/lib32/msvcr71.def.in +++ b/mingw-w64-crt/lib32/msvcr71.def.in @@ -8,6 +8,7 @@ EXPORTS #define PRE_C95_SWPRINTF #define NO_STRCMPI_ALIAS +#define WITH_ATOLL_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) @@ -258,7 +259,6 @@ _amsg_exit _assert _atodbl _atoi64 -atoll == _atoi64 _atoldbl _beep _beginthread diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index a26bbcf7c6dc..6e925eb7c285 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -1,6 +1,8 @@ LIBRARY "MSVCR80.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" ; C++ mangled symbols @@ -364,7 +366,6 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l _atoi_l _atol_l diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index 141abb0f13f8..bbeb8c00ff5a 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -6,6 +6,8 @@ LIBRARY "msvcr90.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall std::__non_rtti_object::__non_rtti_object(class std::__non_rtti_object const &) @@ -365,9 +367,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index 45673bc2f446..c93c2c7133e0 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -6,6 +6,8 @@ LIBRARY "MSVCR90D.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall std::__non_rtti_object::__non_rtti_object(class std::__non_rtti_object const &) @@ -416,9 +418,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in index d848b442602d..913f5091f76b 100644 --- a/mingw-w64-crt/lib64/msvcr100.def.in +++ b/mingw-w64-crt/lib64/msvcr100.def.in @@ -6,6 +6,8 @@ LIBRARY "msvcr100.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -696,9 +698,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in index eacdb82d5705..c6bf1320e572 100644 --- a/mingw-w64-crt/lib64/msvcr110.def.in +++ b/mingw-w64-crt/lib64/msvcr110.def.in @@ -6,6 +6,8 @@ LIBRARY "MSVCR110.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -822,9 +824,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in index d88ad5dff250..5ce4cbd01a9e 100644 --- a/mingw-w64-crt/lib64/msvcr80.def.in +++ b/mingw-w64-crt/lib64/msvcr80.def.in @@ -1,6 +1,8 @@ LIBRARY "MSVCR80.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" ; C++ mangled symbols @@ -309,7 +311,6 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l _atoi_l _atol_l diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in index aef75760e013..f1dc3dc926df 100644 --- a/mingw-w64-crt/lib64/msvcr90.def.in +++ b/mingw-w64-crt/lib64/msvcr90.def.in @@ -6,6 +6,8 @@ LIBRARY "msvcr90.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -313,9 +315,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in index 9dbc4690ca47..e4ccdf28f7c4 100644 --- a/mingw-w64-crt/lib64/msvcr90d.def.in +++ b/mingw-w64-crt/lib64/msvcr90d.def.in @@ -6,6 +6,8 @@ LIBRARY "MSVCR90D.dll" EXPORTS +#define WITH_ATOLL_ALIAS +#define WITH_ATOLL_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -358,9 +360,7 @@ _atof_l _atoflt _atoflt_l _atoi64 -atoll == _atoi64 _atoi64_l -_atoll_l == _atoi64_l _atoi_l _atol_l _atoldbl -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
