File msvcrt-common.def.in is included only in x86 32 and 64 bit msvcrt def files and common msvcrt.def.in file. After moving longjmp, _daylight, _timezone and _tzname out of the msvcrt-common.def.in file, this file would contain only symbol aliases and not export symbols anymore. This makes consistency across all msvcrt def files and makes it clear that msvcrt def file exports only those symbols which are explicitly defined in def file. --- mingw-w64-crt/def-include/msvcrt-common.def.in | 5 ----- mingw-w64-crt/lib-common/msvcrt.def.in | 5 ++++- mingw-w64-crt/lib-common/ucrtbase.def.in | 1 + mingw-w64-crt/lib32/msvcr100.def.in | 4 ++++ mingw-w64-crt/lib32/msvcr110.def.in | 4 ++++ mingw-w64-crt/lib32/msvcr120.def.in | 4 ++++ mingw-w64-crt/lib32/msvcr120d.def.in | 4 ++++ mingw-w64-crt/lib32/msvcr80.def.in | 4 ++++ 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/msvcr120.def.in | 4 ++++ mingw-w64-crt/lib64/msvcr120d.def.in | 4 ++++ mingw-w64-crt/lib64/msvcr80.def.in | 4 ++++ mingw-w64-crt/lib64/msvcr90.def.in | 4 ++++ mingw-w64-crt/lib64/msvcr90d.def.in | 4 ++++ 17 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index c31c6b631572..8294a8880f91 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -143,12 +143,7 @@ ADD_UNDERSCORE(hypot) ;logb ADD_UNDERSCORE(nextafter) -longjmp - #ifndef UCRTBASE -_daylight DATA -_timezone DATA -_tzname DATA ADD_UNDERSCORE(daylight) ADD_UNDERSCORE(timezone) ADD_UNDERSCORE(tzname) diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in index 695a4d7f7cba..b5072dd7122f 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -461,7 +461,7 @@ _cwscanf_l _cwscanf_s _cwscanf_s_l F_X86_ANY(_dstbias DATA) -F_ARM_ANY(_daylight DATA) +_daylight DATA _difftime32 F_I386(== difftime) _difftime64 _dup @@ -1071,12 +1071,14 @@ F_ARM_ANY(_tempnam_dbg) F_I386(_time32 == time) F_ARM_ANY(_time32) _time64 +F_X86_ANY(_timezone DATA) _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +F_X86_ANY(_tzname DATA) _tzset _ui64toa _ui64toa_s @@ -1445,6 +1447,7 @@ F_NON_I386(log10f F_X86_ANY(DATA)) F_ARM_ANY(log10l == log10) F_NON_I386(logf F_X86_ANY(DATA)) F_ARM_ANY(logl == log) +F_X86_ANY(longjmp) malloc mblen F_ARM_ANY(mbrlen) diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in index a90fd72b7397..3df23433d070 100644 --- a/mingw-w64-crt/lib-common/ucrtbase.def.in +++ b/mingw-w64-crt/lib-common/ucrtbase.def.in @@ -2446,6 +2446,7 @@ logbf logbl F_X86_ANY(DATA) F_NON_I386(logf F_X86_ANY(DATA)) F_ARM_ANY(logl == log) +F_X86_ANY(longjmp) lrint lrintf lrintl F_X86_ANY(DATA) diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index 676589296de4..83ee8225ed53 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -807,6 +807,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _difftime32 _difftime64 _dosmaperr @@ -1439,12 +1440,14 @@ _tempnam _time32 _time64 time == _time32 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1786,6 +1789,7 @@ localeconv log DATA ; If we implement log10, we can set it to DATA only. log10 +longjmp malloc mblen mbrlen DATA diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in index 2f2e19b3ce48..62a5ee341553 100644 --- a/mingw-w64-crt/lib32/msvcr110.def.in +++ b/mingw-w64-crt/lib32/msvcr110.def.in @@ -931,6 +931,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _difftime32 _difftime64 _dosmaperr @@ -1572,12 +1573,14 @@ _tempnam _time32 _time64 time == _time32 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1919,6 +1922,7 @@ localeconv log DATA ; If we implement log10, we can set it to DATA only. log10 +longjmp malloc mblen mbrlen diff --git a/mingw-w64-crt/lib32/msvcr120.def.in b/mingw-w64-crt/lib32/msvcr120.def.in index 98567a9566f9..d1bc9bc15d48 100644 --- a/mingw-w64-crt/lib32/msvcr120.def.in +++ b/mingw-w64-crt/lib32/msvcr120.def.in @@ -943,6 +943,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _dclass _difftime32 _difftime64 @@ -1598,12 +1599,14 @@ _tempnam _time32 _time64 time == _time32 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -2096,6 +2099,7 @@ log2l logb logbf logbl +longjmp lrint lrintf lrintl diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in b/mingw-w64-crt/lib32/msvcr120d.def.in index 658e5a314ad6..bd95baebd705 100644 --- a/mingw-w64-crt/lib32/msvcr120d.def.in +++ b/mingw-w64-crt/lib32/msvcr120d.def.in @@ -995,6 +995,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _dclass _difftime32 _difftime64 @@ -1659,12 +1660,14 @@ _tempnam_dbg _time32 _time64 time == _time32 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -2163,6 +2166,7 @@ log2l logb logbf logbl +longjmp lrint lrintf lrintl diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index 42ded14affc2..e0d8ad569e13 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -142,6 +142,7 @@ _creat _cscanf _ctype DATA _cwait +_daylight DATA _difftime32 _difftime64 _dstbias DATA @@ -435,8 +436,10 @@ _sys_nerr DATA _tell _telli64 _tempnam +_timezone DATA _tolower _toupper +_tzname DATA _tzset _ui64toa _ui64tow @@ -667,6 +670,7 @@ _localtime32 log DATA ; If we implement log10, we can set it to DATA only. log10 +longjmp malloc mblen mbstowcs diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index f6de7645e35f..900b8a639b70 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -432,6 +432,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _decode_pointer _difftime32 _difftime64 @@ -1075,12 +1076,14 @@ _tempnam _time32 time == _time32 _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1420,6 +1423,7 @@ localeconv log DATA ; If we have log10 implemtation too, we can set this to DATA only. log10 +longjmp malloc mblen mbrlen DATA diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index 52c33dcf9751..7667df0c9ebd 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -488,6 +488,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _decode_pointer _difftime32 _difftime64 @@ -1141,12 +1142,14 @@ _tempnam_dbg _time32 time == _time32 _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1492,6 +1495,7 @@ localeconv log DATA ; If we implement log10 too, we can set this to DATA only. log10 +longjmp malloc mblen mbrlen diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in index 1530a719f019..a2e3cb60f4dd 100644 --- a/mingw-w64-crt/lib64/msvcr100.def.in +++ b/mingw-w64-crt/lib64/msvcr100.def.in @@ -765,6 +765,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _difftime32 _difftime64 _dosmaperr @@ -1386,12 +1387,14 @@ _tempnam _time32 _time64 time == _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1743,6 +1746,7 @@ log DATA log10 log10f DATA logf DATA +longjmp malloc mblen mbrlen DATA diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in index b5b9e3ec5ced..6bcb84080952 100644 --- a/mingw-w64-crt/lib64/msvcr110.def.in +++ b/mingw-w64-crt/lib64/msvcr110.def.in @@ -891,6 +891,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _difftime32 _difftime64 _dosmaperr @@ -1510,12 +1511,14 @@ _tempnam _time32 _time64 time == _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1867,6 +1870,7 @@ log log10 log10f logf +longjmp malloc mblen mbrlen diff --git a/mingw-w64-crt/lib64/msvcr120.def.in b/mingw-w64-crt/lib64/msvcr120.def.in index 0710c6bfbbb5..5ae5ecfc8aae 100644 --- a/mingw-w64-crt/lib64/msvcr120.def.in +++ b/mingw-w64-crt/lib64/msvcr120.def.in @@ -901,6 +901,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _dclass _difftime32 _difftime64 @@ -1534,12 +1535,14 @@ _tempnam _time32 _time64 time == _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -2046,6 +2049,7 @@ logb logbf logbl logf +longjmp lrint lrintf lrintl diff --git a/mingw-w64-crt/lib64/msvcr120d.def.in b/mingw-w64-crt/lib64/msvcr120d.def.in index 4f2d65ee172e..1d92006719e0 100644 --- a/mingw-w64-crt/lib64/msvcr120d.def.in +++ b/mingw-w64-crt/lib64/msvcr120d.def.in @@ -951,6 +951,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _dclass _difftime32 _difftime64 @@ -1592,12 +1593,14 @@ _tempnam _tempnam_dbg _time32 _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -2110,6 +2113,7 @@ logb logbf logbl logf +longjmp lrint lrintf lrintl diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in index 171f5850f1ff..60f91cb667a3 100644 --- a/mingw-w64-crt/lib64/msvcr80.def.in +++ b/mingw-w64-crt/lib64/msvcr80.def.in @@ -232,6 +232,7 @@ _ctype _cwait _cwprintf _cwscanf +_daylight DATA _difftime32 _difftime64 _dstbias DATA @@ -545,8 +546,10 @@ _telli64 _tempnam _time64 time == _time64 +_timezone DATA _tolower _toupper +_tzname DATA _tzset _ui64toa _ui64tow @@ -799,6 +802,7 @@ log DATA log10 log10f logf DATA +longjmp malloc mblen mbstowcs diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in index 876a672ea234..8095147fe779 100644 --- a/mingw-w64-crt/lib64/msvcr90.def.in +++ b/mingw-w64-crt/lib64/msvcr90.def.in @@ -380,6 +380,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _decode_pointer _difftime32 _difftime64 @@ -1008,12 +1009,14 @@ _tempnam _time32 _time64 time == _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1363,6 +1366,7 @@ log DATA log10 log10f DATA logf DATA +longjmp malloc mblen mbrlen DATA diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in index 26c5888e681f..a98257ee8e2b 100644 --- a/mingw-w64-crt/lib64/msvcr90d.def.in +++ b/mingw-w64-crt/lib64/msvcr90d.def.in @@ -430,6 +430,7 @@ _cwscanf _cwscanf_l _cwscanf_s _cwscanf_s_l +_daylight DATA _decode_pointer _difftime32 _difftime64 @@ -1068,12 +1069,14 @@ _tempnam_dbg _time32 _time64 time == _time64 +_timezone DATA _tolower _tolower_l _toupper _toupper_l _towlower_l _towupper_l +_tzname DATA _tzset _ui64toa _ui64toa_s @@ -1429,6 +1432,7 @@ log DATA log10 log10f logf DATA +longjmp malloc mblen mbrlen -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
