def-include/msvcrt-common.def.in is included into every msvcr*.def.in file. So move them all common __ms_* symbol aliases which removes definition duplication.
msvcr* library before version 8.0 have symbols swprintf/vswprintf which represents pre-C95 variants of these functions without maxlen argument. Since version 8.0, symbols swprintf/vswprintf are not present anymore, they were renamed and have have leading underscore. Distinguish aliased symbol by a new PRE_C95_SWPRINTF macro in .def.in file. --- .../def-include/msvcrt-common.def.in | 30 +++++++++++++++++++ mingw-w64-crt/lib-common/msvcr120_app.def.in | 16 ---------- mingw-w64-crt/lib-common/msvcrt.def.in | 21 +------------ mingw-w64-crt/lib32/crtdll.def.in | 1 + mingw-w64-crt/lib32/msvcr100.def.in | 16 ---------- mingw-w64-crt/lib32/msvcr110.def.in | 16 ---------- mingw-w64-crt/lib32/msvcr120.def.in | 16 ---------- mingw-w64-crt/lib32/msvcr120d.def.in | 16 ---------- mingw-w64-crt/lib32/msvcr70.def.in | 1 + mingw-w64-crt/lib32/msvcr71.def.in | 1 + mingw-w64-crt/lib32/msvcr80.def.in | 18 ----------- mingw-w64-crt/lib32/msvcr90.def.in | 16 ---------- mingw-w64-crt/lib32/msvcr90d.def.in | 16 ---------- mingw-w64-crt/lib32/msvcrt10.def.in | 1 + mingw-w64-crt/lib32/msvcrt20.def.in | 1 + mingw-w64-crt/lib32/msvcrt40.def.in | 1 + mingw-w64-crt/lib64/msvcr100.def.in | 16 ---------- mingw-w64-crt/lib64/msvcr110.def.in | 16 ---------- mingw-w64-crt/lib64/msvcr120.def.in | 16 ---------- mingw-w64-crt/lib64/msvcr120d.def.in | 16 ---------- mingw-w64-crt/lib64/msvcr80.def.in | 18 ----------- mingw-w64-crt/lib64/msvcr90.def.in | 16 ---------- mingw-w64-crt/lib64/msvcr90d.def.in | 16 ---------- mingw-w64-crt/libarm32/msvcr110.def | 16 ---------- mingw-w64-crt/libarm32/msvcr120_clr0400.def | 16 ---------- 25 files changed, 37 insertions(+), 296 deletions(-) diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in index 975df5da9960..4285ec5d6dc0 100644 --- a/mingw-w64-crt/def-include/msvcrt-common.def.in +++ b/mingw-w64-crt/def-include/msvcrt-common.def.in @@ -155,3 +155,33 @@ tzname DATA == _tzname ADD_UNDERSCORE(vsnprintf_s) #endif + +; This is list of printf/scanf symbol aliases with __ms_ prefix +#ifndef UCRTBASE +__ms_fprintf == fprintf +__ms_fscanf == fscanf +__ms_fwprintf == fwprintf +__ms_fwscanf == fwscanf +__ms_printf == printf +__ms_scanf == scanf +__ms_sprintf == sprintf +__ms_sscanf == sscanf +#ifdef PRE_C95_SWPRINTF +__ms_swprintf == swprintf +#else +__ms_swprintf == _swprintf +#endif +__ms_swscanf == swscanf +__ms_vfprintf == vfprintf +__ms_vfwprintf == vfwprintf +__ms_vprintf == vprintf +__ms_vsprintf == vsprintf +#ifdef PRE_C95_SWPRINTF +__ms_vswprintf == vswprintf +#else +__ms_vswprintf == _vswprintf +#endif +__ms_vwprintf == vwprintf +__ms_wprintf == wprintf +__ms_wscanf == wscanf +#endif diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in b/mingw-w64-crt/lib-common/msvcr120_app.def.in index 4204c7b265b8..1c7c8bde4d75 100644 --- a/mingw-w64-crt/lib-common/msvcr120_app.def.in +++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in @@ -2197,7 +2197,6 @@ F_NON_I386(fmodf) fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -2210,17 +2209,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -2347,7 +2343,6 @@ perror pow F_NON_I386(powf) printf -__ms_printf == printf printf_s putc putchar @@ -2384,7 +2379,6 @@ scalbnf scalbnl #endif scanf -__ms_scanf == scanf scanf_s setbuf F_NON_I386(setjmp) @@ -2396,13 +2390,11 @@ F_NON_I386(sinf) sinh F_NON_I386(sinhf) sprintf -__ms_sprintf == sprintf sprintf_s sqrt F_NON_I386(sqrtf) srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -2441,7 +2433,6 @@ strxfrm F_ARM32(swprintf) swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s F_ARM32(system) tan @@ -2468,22 +2459,18 @@ ungetc ungetwc F_ARM32(utime) vfprintf -__ms_vfprintf == vfprintf vfprintf_s F_X86_ANY(vfscanf) F_X86_ANY(vfscanf_s) vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s F_X86_ANY(vfwscanf) F_X86_ANY(vfwscanf_s) vprintf -__ms_vprintf == vprintf vprintf_s F_X86_ANY(vscanf) F_X86_ANY(vscanf_s) vsprintf -__ms_vsprintf == vsprintf vsprintf_s F_X86_ANY(vsscanf) F_X86_ANY(vsscanf_s) @@ -2492,7 +2479,6 @@ vswprintf_s F_X86_ANY(vswscanf) F_X86_ANY(vswscanf_s) vwprintf -__ms_vwprintf == vwprintf vwprintf_s F_X86_ANY(vwscanf) F_X86_ANY(vwscanf_s) @@ -2542,8 +2528,6 @@ F_X86_ANY(wctype) F_X86_ANY(wmemcpy_s) F_X86_ANY(wmemmove_s) wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in index b5b971d2052c..5085a136ef89 100644 --- a/mingw-w64-crt/lib-common/msvcrt.def.in +++ b/mingw-w64-crt/lib-common/msvcrt.def.in @@ -1,6 +1,7 @@ LIBRARY "msvcrt.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "func.def.in" #include "msvcrt-common.def.in" @@ -1855,26 +1856,6 @@ 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 internal symbol aliases for printf/scanf functions used by mingw -__ms_fprintf == fprintf -__ms_fscanf == fscanf -__ms_fwprintf == fwprintf -__ms_fwscanf == fwscanf -__ms_printf == printf -__ms_scanf == scanf -__ms_sprintf == sprintf -__ms_sscanf == sscanf -__ms_swprintf == swprintf -__ms_swscanf == swscanf -__ms_vfprintf == vfprintf -__ms_vfwprintf == vfwprintf -__ms_vprintf == vprintf -__ms_vsprintf == vsprintf -__ms_vswprintf == vswprintf -__ms_vwprintf == vwprintf -__ms_wprintf == wprintf -__ms_wscanf == wscanf - ; 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/crtdll.def.in b/mingw-w64-crt/lib32/crtdll.def.in index 25f13931b24c..c4fe47ff05fc 100644 --- a/mingw-w64-crt/lib32/crtdll.def.in +++ b/mingw-w64-crt/lib32/crtdll.def.in @@ -67,6 +67,7 @@ LIBRARY "crtdll.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "msvcrt-common.def.in" ; crtdll.dll contains 3 mangled C++ symbols diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in index a747c584751e..cc1ff77aca9f 100644 --- a/mingw-w64-crt/lib32/msvcr100.def.in +++ b/mingw-w64-crt/lib32/msvcr100.def.in @@ -1719,7 +1719,6 @@ fmod DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1732,17 +1731,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1810,7 +1806,6 @@ modf DATA perror pow DATA printf -__ms_printf == printf printf_s putc putchar @@ -1827,7 +1822,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -1837,12 +1831,10 @@ sin DATA ; If we implenent sinh, we can set it to DATA only. sinh sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1874,7 +1866,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1891,20 +1882,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb DATA wcrtomb_s @@ -1944,8 +1930,6 @@ wctomb_s wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib32/msvcr110.def.in b/mingw-w64-crt/lib32/msvcr110.def.in index b21a518202bc..477f22be24dc 100644 --- a/mingw-w64-crt/lib32/msvcr110.def.in +++ b/mingw-w64-crt/lib32/msvcr110.def.in @@ -1852,7 +1852,6 @@ fmod DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1865,17 +1864,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1943,7 +1939,6 @@ modf DATA perror pow DATA printf -__ms_printf == printf printf_s putc putchar @@ -1960,7 +1955,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -1970,12 +1964,10 @@ sin DATA ; If we implement sinh, we can set it to DATA only. sinh sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -2007,7 +1999,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -2024,20 +2015,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -2077,8 +2063,6 @@ wctomb_s wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib32/msvcr120.def.in b/mingw-w64-crt/lib32/msvcr120.def.in index 0287de2597dc..16b7896ca583 100644 --- a/mingw-w64-crt/lib32/msvcr120.def.in +++ b/mingw-w64-crt/lib32/msvcr120.def.in @@ -2005,7 +2005,6 @@ fmod fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -2018,17 +2017,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -2138,7 +2134,6 @@ norml perror pow printf -__ms_printf == printf printf_s putc putchar @@ -2173,7 +2168,6 @@ scalbn scalbnf scalbnl scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -2182,12 +2176,10 @@ signal sin sinh sprintf -__ms_sprintf == sprintf sprintf_s sqrt srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -2225,7 +2217,6 @@ strtoumax strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -2248,24 +2239,20 @@ truncl ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfscanf vfscanf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vfwscanf vfwscanf_s vprintf -__ms_vprintf == vprintf vprintf_s snwprintf == _snwprintf vsnwprintf == _vsnwprintf vscanf vscanf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vsscanf vsscanf_s @@ -2273,7 +2260,6 @@ vswprintf_s vswscanf vswscanf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s vwscanf vwscanf_s @@ -2323,8 +2309,6 @@ wctype wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in b/mingw-w64-crt/lib32/msvcr120d.def.in index 807aaacdfd7e..04a5c4b7362c 100644 --- a/mingw-w64-crt/lib32/msvcr120d.def.in +++ b/mingw-w64-crt/lib32/msvcr120d.def.in @@ -2072,7 +2072,6 @@ fmod fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -2085,17 +2084,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -2206,7 +2202,6 @@ norml perror pow printf -__ms_printf == printf printf_s putc putchar @@ -2241,7 +2236,6 @@ scalbn scalbnf scalbnl scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -2250,12 +2244,10 @@ signal sin sinh sprintf -__ms_sprintf == sprintf sprintf_s sqrt srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -2293,7 +2285,6 @@ strtoumax strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -2316,24 +2307,20 @@ truncl ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfscanf vfscanf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vfwscanf vfwscanf_s vprintf -__ms_vprintf == vprintf vprintf_s snwprintf == _snwprintf vsnwprintf == _vsnwprintf vscanf vscanf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vsscanf vsscanf_s @@ -2341,7 +2328,6 @@ vswprintf_s vswscanf vswscanf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s vwscanf vwscanf_s @@ -2391,9 +2377,7 @@ wctype wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib32/msvcr70.def.in b/mingw-w64-crt/lib32/msvcr70.def.in index b01988cc3154..be830fa15dfe 100644 --- a/mingw-w64-crt/lib32/msvcr70.def.in +++ b/mingw-w64-crt/lib32/msvcr70.def.in @@ -6,6 +6,7 @@ LIBRARY "MSVCR70.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) diff --git a/mingw-w64-crt/lib32/msvcr71.def.in b/mingw-w64-crt/lib32/msvcr71.def.in index afd74527d065..e1a7c9c3bf41 100644 --- a/mingw-w64-crt/lib32/msvcr71.def.in +++ b/mingw-w64-crt/lib32/msvcr71.def.in @@ -6,6 +6,7 @@ LIBRARY "MSVCR71.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "msvcrt-common.def.in" ; public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in index f16d3a8f755b..c550e2bb1fa0 100644 --- a/mingw-w64-crt/lib32/msvcr80.def.in +++ b/mingw-w64-crt/lib32/msvcr80.def.in @@ -1061,7 +1061,6 @@ _strupr_s_l _strxfrm_l _swab _swprintf -__ms_swprintf == _swprintf _swprintf_c _swprintf_p _swprintf_p_l @@ -1155,7 +1154,6 @@ _vsprintf_p _vsprintf_p_l _vsprintf_s_l _vswprintf -__ms_vswprintf == _vswprintf _vswprintf_c _vswprintf_c_l _vswprintf_l @@ -1361,7 +1359,6 @@ fmod DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1373,17 +1370,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1446,7 +1440,6 @@ modf DATA perror pow DATA printf -__ms_printf == printf printf_s putc putchar @@ -1463,7 +1456,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -1472,12 +1464,10 @@ signal sin DATA sinh ; If we impelement sinh, we can set it to DATA only. sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1509,7 +1499,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1525,20 +1514,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -1576,10 +1560,8 @@ wctob wctomb wctomb_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s ; These symbols are not available in the original Microsoft Visual C++ 2005 version of msvcr80.dll diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in index 491be2a912fe..1a2682e030ba 100644 --- a/mingw-w64-crt/lib32/msvcr90.def.in +++ b/mingw-w64-crt/lib32/msvcr90.def.in @@ -1355,7 +1355,6 @@ fmod DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1368,17 +1367,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1442,7 +1438,6 @@ modf DATA perror pow DATA printf -__ms_printf == printf printf_s putc putchar @@ -1459,7 +1454,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -1469,12 +1463,10 @@ sin DATA ; If we have sinh implemtation, we can set it to DATA only. sinh sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1506,7 +1498,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1523,20 +1514,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb DATA wcrtomb_s @@ -1574,8 +1560,6 @@ wctob DATA wctomb wctomb_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in index f6437524b7ff..35b5ce08765e 100644 --- a/mingw-w64-crt/lib32/msvcr90d.def.in +++ b/mingw-w64-crt/lib32/msvcr90d.def.in @@ -1427,7 +1427,6 @@ fmod DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1440,17 +1439,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1514,7 +1510,6 @@ modf DATA perror pow DATA printf -__ms_printf == printf printf_s putc putchar @@ -1531,7 +1526,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setlocale @@ -1541,12 +1535,10 @@ sin DATA ; If we implement sinh too, we can set it to DATA only. sinh sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1578,7 +1570,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1595,20 +1586,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -1646,8 +1632,6 @@ wctob wctomb wctomb_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib32/msvcrt10.def.in b/mingw-w64-crt/lib32/msvcrt10.def.in index 00c2ef017076..3474977fc4f8 100644 --- a/mingw-w64-crt/lib32/msvcrt10.def.in +++ b/mingw-w64-crt/lib32/msvcrt10.def.in @@ -6,6 +6,7 @@ LIBRARY "MSVCRT10.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "msvcrt-common.def.in" ; public: __thiscall Iostream_init::Iostream_init(class ios &,int) diff --git a/mingw-w64-crt/lib32/msvcrt20.def.in b/mingw-w64-crt/lib32/msvcrt20.def.in index 4f7fcef10956..1230cd7deb59 100644 --- a/mingw-w64-crt/lib32/msvcrt20.def.in +++ b/mingw-w64-crt/lib32/msvcrt20.def.in @@ -6,6 +6,7 @@ LIBRARY "MSVCRT20.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "msvcrt-common.def.in" ; public: __thiscall Iostream_init::Iostream_init(class ios &,int) diff --git a/mingw-w64-crt/lib32/msvcrt40.def.in b/mingw-w64-crt/lib32/msvcrt40.def.in index da23d05698fc..c46eb3c00508 100644 --- a/mingw-w64-crt/lib32/msvcrt40.def.in +++ b/mingw-w64-crt/lib32/msvcrt40.def.in @@ -6,6 +6,7 @@ LIBRARY "MSVCRT40.dll" EXPORTS +#define PRE_C95_SWPRINTF #include "msvcrt-common.def.in" ; public: __thiscall Iostream_init::Iostream_init(class ios &,int) diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in index 12a4fd13d44c..eb0c551a8c6f 100644 --- a/mingw-w64-crt/lib64/msvcr100.def.in +++ b/mingw-w64-crt/lib64/msvcr100.def.in @@ -1675,7 +1675,6 @@ fmodf DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1688,17 +1687,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1769,7 +1765,6 @@ perror pow DATA powf DATA printf -__ms_printf == printf printf_s putc putchar @@ -1786,7 +1781,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1798,13 +1792,11 @@ sinf DATA sinh sinhf DATA sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA sqrtf DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1836,7 +1828,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1854,20 +1845,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb DATA wcrtomb_s @@ -1907,8 +1893,6 @@ wctomb_s wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib64/msvcr110.def.in b/mingw-w64-crt/lib64/msvcr110.def.in index 4ea4cc4eb280..fd4c7445b908 100644 --- a/mingw-w64-crt/lib64/msvcr110.def.in +++ b/mingw-w64-crt/lib64/msvcr110.def.in @@ -1799,7 +1799,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1812,17 +1811,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1893,7 +1889,6 @@ perror pow powf printf -__ms_printf == printf printf_s putc putchar @@ -1910,7 +1905,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1922,13 +1916,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt sqrtf srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1960,7 +1952,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1978,20 +1969,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -2031,8 +2017,6 @@ wctomb_s wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib64/msvcr120.def.in b/mingw-w64-crt/lib64/msvcr120.def.in index 8954520d914a..24564408a8ed 100644 --- a/mingw-w64-crt/lib64/msvcr120.def.in +++ b/mingw-w64-crt/lib64/msvcr120.def.in @@ -1953,7 +1953,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1966,17 +1965,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -2090,7 +2086,6 @@ perror pow powf printf -__ms_printf == printf printf_s putc putchar @@ -2125,7 +2120,6 @@ scalbn scalbnf scalbnl scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -2137,13 +2131,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt sqrtf srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -2181,7 +2173,6 @@ strtoumax strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -2206,22 +2197,18 @@ truncl ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfscanf vfscanf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vfwscanf vfwscanf_s vprintf -__ms_vprintf == vprintf vprintf_s vscanf vscanf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vsscanf vsscanf_s @@ -2229,7 +2216,6 @@ vswprintf_s vswscanf vswscanf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s vwscanf vwscanf_s @@ -2279,8 +2265,6 @@ wctype wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib64/msvcr120d.def.in b/mingw-w64-crt/lib64/msvcr120d.def.in index 608d4be978f9..539591cac80f 100644 --- a/mingw-w64-crt/lib64/msvcr120d.def.in +++ b/mingw-w64-crt/lib64/msvcr120d.def.in @@ -2017,7 +2017,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -2030,17 +2029,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -2154,7 +2150,6 @@ perror pow powf printf -__ms_printf == printf printf_s putc putchar @@ -2189,7 +2184,6 @@ scalbn scalbnf scalbnl scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -2201,13 +2195,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt sqrtf srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -2245,7 +2237,6 @@ strtoumax strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -2270,22 +2261,18 @@ truncl ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfscanf vfscanf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vfwscanf vfwscanf_s vprintf -__ms_vprintf == vprintf vprintf_s vscanf vscanf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vsscanf vsscanf_s @@ -2293,7 +2280,6 @@ vswprintf_s vswscanf vswscanf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s vwscanf vwscanf_s @@ -2343,9 +2329,7 @@ wctype wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in index 8f1d297ef4a8..a9663a90ae80 100644 --- a/mingw-w64-crt/lib64/msvcr80.def.in +++ b/mingw-w64-crt/lib64/msvcr80.def.in @@ -991,7 +991,6 @@ _strupr_s_l _strxfrm_l _swab _swprintf -__ms_swprintf == _swprintf _swprintf_c _swprintf_p _swprintf_p_l @@ -1085,7 +1084,6 @@ _vsprintf_p _vsprintf_p_l _vsprintf_s_l _vswprintf -__ms_vswprintf == _vswprintf _vswprintf_c _vswprintf_c_l _vswprintf_l @@ -1301,7 +1299,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1313,17 +1310,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1390,7 +1384,6 @@ perror pow DATA powf DATA printf -__ms_printf == printf printf_s putc putchar @@ -1407,7 +1400,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1419,13 +1411,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA sqrtf DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1457,7 +1447,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1475,20 +1464,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -1526,10 +1510,8 @@ wctob wctomb wctomb_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s ; These symbols are not available in the original Microsoft Visual C++ 2005 version of msvcr80.dll diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in index 4a7f62476dd5..774b60cad55c 100644 --- a/mingw-w64-crt/lib64/msvcr90.def.in +++ b/mingw-w64-crt/lib64/msvcr90.def.in @@ -1297,7 +1297,6 @@ fmodf DATA fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1310,17 +1309,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1387,7 +1383,6 @@ perror pow DATA powf DATA printf -__ms_printf == printf printf_s putc putchar @@ -1404,7 +1399,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1416,13 +1410,11 @@ sinf DATA sinh sinhf DATA sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA sqrtf DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1454,7 +1446,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1472,20 +1463,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb DATA wcrtomb_s @@ -1523,8 +1509,6 @@ wctob DATA wctomb wctomb_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in index 980773b3263d..74797db37116 100644 --- a/mingw-w64-crt/lib64/msvcr90d.def.in +++ b/mingw-w64-crt/lib64/msvcr90d.def.in @@ -1363,7 +1363,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1376,17 +1375,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1453,7 +1449,6 @@ perror pow powf printf -__ms_printf == printf printf_s putc putchar @@ -1470,7 +1465,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1482,13 +1476,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt DATA sqrtf DATA srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1520,7 +1512,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1538,20 +1529,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -1589,8 +1575,6 @@ wctob wctomb wctomb_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/libarm32/msvcr110.def b/mingw-w64-crt/libarm32/msvcr110.def index 4d3d0ee6dafa..4971fd92e6b5 100644 --- a/mingw-w64-crt/libarm32/msvcr110.def +++ b/mingw-w64-crt/libarm32/msvcr110.def @@ -1431,7 +1431,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1444,17 +1443,14 @@ freopen freopen_s frexp fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1525,7 +1521,6 @@ perror pow powf printf -__ms_printf == printf printf_s putc putchar @@ -1542,7 +1537,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1554,13 +1548,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt sqrtf srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1592,7 +1584,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1610,20 +1601,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -1663,8 +1649,6 @@ wctomb_s wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s diff --git a/mingw-w64-crt/libarm32/msvcr120_clr0400.def b/mingw-w64-crt/libarm32/msvcr120_clr0400.def index ab659babc161..1410ec131db9 100644 --- a/mingw-w64-crt/libarm32/msvcr120_clr0400.def +++ b/mingw-w64-crt/libarm32/msvcr120_clr0400.def @@ -1430,7 +1430,6 @@ fmodf fopen fopen_s fprintf -__ms_fprintf == fprintf fprintf_s fputc fputs @@ -1443,17 +1442,14 @@ freopen freopen_s frexp DATA fscanf -__ms_fscanf == fscanf fscanf_s fseek fsetpos ftell fwprintf -__ms_fwprintf == fwprintf fwprintf_s fwrite fwscanf -__ms_fwscanf == fwscanf fwscanf_s getc getchar @@ -1524,7 +1520,6 @@ perror pow powf printf -__ms_printf == printf printf_s putc putchar @@ -1541,7 +1536,6 @@ remove rename rewind scanf -__ms_scanf == scanf scanf_s setbuf setjmp @@ -1553,13 +1547,11 @@ sinf sinh sinhf sprintf -__ms_sprintf == sprintf sprintf_s sqrt sqrtf srand sscanf -__ms_sscanf == sscanf sscanf_s strcat strcat_s @@ -1591,7 +1583,6 @@ strtoul strxfrm swprintf_s swscanf -__ms_swscanf == swscanf swscanf_s system tan @@ -1609,20 +1600,15 @@ towupper ungetc ungetwc vfprintf -__ms_vfprintf == vfprintf vfprintf_s vfwprintf -__ms_vfwprintf == vfwprintf vfwprintf_s vprintf -__ms_vprintf == vprintf vprintf_s vsprintf -__ms_vsprintf == vsprintf vsprintf_s vswprintf_s vwprintf -__ms_vwprintf == vwprintf vwprintf_s wcrtomb wcrtomb_s @@ -1662,8 +1648,6 @@ wctomb_s wmemcpy_s wmemmove_s wprintf -__ms_wprintf == wprintf wprintf_s wscanf -__ms_wscanf == wscanf wscanf_s -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
