crt: msvcrt.dll: use replacements for C95 conversion functions
Previously, replacements were used only for i386 and x86_64 versions
of msvcrt.dll.
Signed-off-by: Kirill Makurin <maiddaisuki@outlook.com>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 97da616..a393bf7 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -338,6 +338,8 @@
misc/iswblank.c \
misc/_isblank_l.c \
misc/_iswblank_l.c \
+ misc/mbrtowc.c \
+ misc/wcrtomb.c \
misc/wctrans.c \
misc/wctype.c \
secapi/_vscprintf_p.c \
@@ -554,7 +556,6 @@
misc/btowc.c \
misc/imaxabs.c \
misc/lc_locale_func.c \
- misc/mbrtowc.c \
misc/output_format.c \
misc/_get_errno.c \
misc/_set_errno.c \
@@ -562,7 +563,6 @@
misc/strtoimax.c \
misc/strtoumax.c \
misc/wassert.c \
- misc/wcrtomb.c \
misc/wcsnlen.c \
misc/wcstoimax.c \
misc/wcstoumax.c \
@@ -616,13 +616,11 @@
misc/_get_current_locale.c \
misc/_initterm_e.c \
misc/btowc.c \
- misc/mbrtowc.c \
misc/output_format.c \
misc/_get_errno.c \
misc/_set_errno.c \
misc/strnlen.c \
misc/wassert.c \
- misc/wcrtomb.c \
misc/wcsnlen.c \
misc/wctob.c \
stdio/_fseeki64.c \
diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in
index 7b90336..47582c1 100644
--- a/mingw-w64-crt/lib-common/msvcrt.def.in
+++ b/mingw-w64-crt/lib-common/msvcrt.def.in
@@ -1804,10 +1804,10 @@
fwprintf_s
fwscanf_s
F_ARM_ANY(getenv_s) ; i386 and x64 getenv_s replaced by emu
-F_ARM_ANY(mbrlen) ; i386 and x64 mbrlen replaced by emu
-F_ARM_ANY(mbrtowc) ; i386 and x64 mbrtowc replaced by emu
+; F_ARM_ANY(mbrlen) ; always use replacement
+; F_ARM_ANY(mbrtowc) ; always use replacement
mbsdup_dbg
-F_ARM_ANY(mbsrtowcs) ; i386 and x64 mbsrtowcs replaced by emu
+; F_ARM_ANY(mbsrtowcs) ; always use replacement
mbsrtowcs_s
mbstowcs_s
F_ARM_ANY(memcpy_s) ; i386 and x64 memcpy_s replaced by emu
@@ -1838,14 +1838,14 @@
F_ARM_ANY(vsprintf_s) ; i386 and x64 vsprintf_s replaced by emu
vswprintf_s
vwprintf_s
-F_ARM_ANY(wcrtomb) ; i386 and x64 wcrtomb replaced by emu
+; F_ARM_ANY(wcrtomb) ; always use replacement
wcrtomb_s
wcscat_s
wcscpy_s
wcsncat_s
wcsncpy_s
F_ARM_ANY(wcsnlen) ; i386 and x64 wcsnlen replaced by emu
-F_ARM_ANY(wcsrtombs) ; i386 and x64 wcsrtombs replaced by emu
+; F_ARM_ANY(wcsrtombs) ; always use replacement
wcsrtombs_s
F_ARM_ANY(wcstok_s) ; i386 and x64 wcstok_s replaced by emu
wcstombs_s
