Define symbol aliases based on a new WITH_STRTO64_ALIAS and WITH_STRTO64_L_ALIAS macros. --- mingw-w64-crt/def-include/msvcrt-common.def.in | 14 ++++++++++++++ mingw-w64-crt/lib-common/msvcrt.def.in | 13 +++---------- mingw-w64-crt/lib32/msvcr100.def.in | 10 ++-------- mingw-w64-crt/lib32/msvcr110.def.in | 10 ++-------- mingw-w64-crt/lib32/msvcr70.def.in | 5 +---- mingw-w64-crt/lib32/msvcr71.def.in | 5 +---- mingw-w64-crt/lib32/msvcr80.def.in | 6 ++---- mingw-w64-crt/lib32/msvcr90.def.in | 10 ++-------- mingw-w64-crt/lib32/msvcr90d.def.in | 10 ++-------- mingw-w64-crt/lib64/msvcr100.def.in | 10 ++-------- mingw-w64-crt/lib64/msvcr110.def.in | 10 ++-------- mingw-w64-crt/lib64/msvcr80.def.in | 6 ++---- mingw-w64-crt/lib64/msvcr90.def.in | 10 ++-------- mingw-w64-crt/lib64/msvcr90d.def.in | 10 ++-------- 14 files changed, 39 insertions(+), 90 deletions(-)
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index 968c5f95f530..3e2c674d3699 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -183,6 +183,20 @@ imaxabs == llabs imaxdiv == lldiv #endif +#ifdef WITH_STRTO64_ALIAS +strtoll == _strtoi64 +strtoull == _strtoui64 +strtoimax == _strtoi64 +strtoumax == _strtoui64 +#endif + +#ifdef WITH_STRTO64_L_ALIAS +_strtoll_l == _strtoi64_l +_strtoull_l == _strtoui64_l +_strtoimax_l == _strtoi64_l +_strtoumax_l == _strtoui64_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 8bfb5b59bc63..4057ff749359 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -5,9 +5,12 @@ EXPORTS #define NO_STRCMPI_ALIAS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS +#define WITH_STRTO64_L_ALIAS #ifndef DEF_I386 ; i386 llabs and imaxabs alias provided by emu #define WITH_LLABS_ALIAS +; i386 strtoll, strtoull, strtoimax and strtoumax alias provided by emu +#define WITH_STRTO64_ALIAS #endif #include "func.def.in" #include "msvcrt-common.def.in" @@ -1849,16 +1852,6 @@ F64(_wfindnext64i32 == _wfindnext) 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 -_strtoimax_l == _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l -F_NON_I386(strtoimax == _strtoi64) ; i386 strtoimax alias provided by emu -F_NON_I386(strtoll == _strtoi64) ; i386 strtoll alias provided by emu -F_NON_I386(strtoull == _strtoui64) ; i386 strtoull alias provided by emu -F_NON_I386(strtoumax == _strtoui64) ; i386 strtoumax alias provided by emu - ; This is list of additional symbol aliases not available in any CRT library ; FIXME: check if these really are needed F32(_ftime_s == _ftime32_s) diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index 863255f7b0dc..6313239adf7d 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -10,6 +10,8 @@ EXPORTS #define WITH_ATOLL_L_ALIAS #define WITH_IMAXABS_ALIAS #define WITH_IMAXDIV_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Concurrency::details::<0x1ULL>::<0x1ULL>(void(__cdecl *)(void)) @@ -1405,18 +1407,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in index c5bb95e450e8..51e64e0967d4 100644 --- a/mingw-w64-crt/lib32/msvcr110.def.in +++ b/mingw-w64-crt/lib32/msvcr110.def.in @@ -10,6 +10,8 @@ EXPORTS #define WITH_ATOLL_L_ALIAS #define WITH_IMAXABS_ALIAS #define WITH_IMAXDIV_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall Concurrency::details::<0x1ULL>::<0x1ULL>(void(__cdecl *)(void)) @@ -1538,18 +1540,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib32/msvcr70.def.in b/mingw-w64-crt/lib32/msvcr70.def.in index 266643b4d015..f95164edac0e 100644 --- a/mingw-w64-crt/lib32/msvcr70.def.in +++ b/mingw-w64-crt/lib32/msvcr70.def.in @@ -9,6 +9,7 @@ EXPORTS #define PRE_C95_SWPRINTF #define NO_STRCMPI_ALIAS #define WITH_ATOLL_ALIAS +#define WITH_STRTO64_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) @@ -590,11 +591,7 @@ _strrev _strset _strtime _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strupr _swab _sys_errlist DATA diff --git a/mingw-w64-crt/lib32/msvcr71.def.in b/mingw-w64-crt/lib32/msvcr71.def.in index 000a1263b580..6e5ee4d6d395 100644 --- a/mingw-w64-crt/lib32/msvcr71.def.in +++ b/mingw-w64-crt/lib32/msvcr71.def.in @@ -9,6 +9,7 @@ EXPORTS #define PRE_C95_SWPRINTF #define NO_STRCMPI_ALIAS #define WITH_ATOLL_ALIAS +#define WITH_STRTO64_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) @@ -584,11 +585,7 @@ _strrev _strset _strtime _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strupr _swab _sys_errlist DATA diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index 9143ac279a85..56cdc53e7ef4 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -4,6 +4,8 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS #define WITH_LLABS_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" ; C++ mangled symbols @@ -1044,13 +1046,9 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l _strtoul_l _strupr diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index 63219131a765..7b1085178cdf 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -9,6 +9,8 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS #define WITH_LLABS_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall std::__non_rtti_object::__non_rtti_object(class std::__non_rtti_object const &) @@ -1038,18 +1040,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index 071b537b2e60..4c31b632351e 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -9,6 +9,8 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS #define WITH_LLABS_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" ; public: __thiscall std::__non_rtti_object::__non_rtti_object(class std::__non_rtti_object const &) @@ -1103,18 +1105,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in index 5efc3ccb13df..cb29048e40ad 100644 --- a/mingw-w64-crt/lib64/msvcr100.def.in +++ b/mingw-w64-crt/lib64/msvcr100.def.in @@ -10,6 +10,8 @@ EXPORTS #define WITH_ATOLL_L_ALIAS #define WITH_IMAXABS_ALIAS #define WITH_IMAXDIV_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -1352,18 +1354,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in index 4618592bed35..338a7772cd59 100644 --- a/mingw-w64-crt/lib64/msvcr110.def.in +++ b/mingw-w64-crt/lib64/msvcr110.def.in @@ -10,6 +10,8 @@ EXPORTS #define WITH_ATOLL_L_ALIAS #define WITH_IMAXABS_ALIAS #define WITH_IMAXDIV_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -1476,18 +1478,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in index 323745d5cc9c..1a2f631aaca6 100644 --- a/mingw-w64-crt/lib64/msvcr80.def.in +++ b/mingw-w64-crt/lib64/msvcr80.def.in @@ -4,6 +4,8 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS #define WITH_LLABS_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" ; C++ mangled symbols @@ -974,13 +976,9 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l _strtoul_l _strupr diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in index d1391709b9bc..da117e436eb7 100644 --- a/mingw-w64-crt/lib64/msvcr90.def.in +++ b/mingw-w64-crt/lib64/msvcr90.def.in @@ -9,6 +9,8 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS #define WITH_LLABS_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -971,18 +973,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in index 3ae62e25fe30..3c7d7525a01d 100644 --- a/mingw-w64-crt/lib64/msvcr90d.def.in +++ b/mingw-w64-crt/lib64/msvcr90d.def.in @@ -9,6 +9,8 @@ EXPORTS #define WITH_ATOLL_ALIAS #define WITH_ATOLL_L_ALIAS #define WITH_LLABS_ALIAS +#define WITH_STRTO64_ALIAS +#define WITH_STRTO64_L_ALIAS #include "msvcrt-common.def.in" $I10_OUTPUT @@ -1030,18 +1032,10 @@ _strtime _strtime_s _strtod_l _strtoi64 -strtoll == _strtoi64 -strtoimax == _strtoi64 _strtoi64_l -_strtoll_l == _strtoi64_l -_strtoimax_l == _strtoi64_l _strtol_l _strtoui64 -strtoull == _strtoui64 -strtoumax == _strtoui64 _strtoui64_l -_strtoull_l == _strtoui64_l -_strtoumax_l == _strtoui64_l _strtoul_l _strupr _strupr_l -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
