Add symbols __initialize_lconv_for_unsigned_char, _query_app_type and
_set_app_type into msvcrt import libs.
---
mingw-w64-crt/def-include/crt-aliases.def.in | 13 +++++++++++++
mingw-w64-crt/lib32/crtdll.def.in | 2 ++
mingw-w64-crt/lib32/msvcr80.def.in | 1 +
mingw-w64-crt/lib32/msvcr80d.def.in | 1 +
mingw-w64-crt/lib32/msvcr90.def.in | 1 +
mingw-w64-crt/lib32/msvcr90d.def.in | 1 +
mingw-w64-crt/lib32/msvcrt10.def.in | 2 ++
mingw-w64-crt/lib32/msvcrt20.def.in | 1 +
mingw-w64-crt/lib64/msvcr90.def.in | 1 +
mingw-w64-crt/lib64/msvcr90d.def.in | 1 +
mingw-w64-crt/misc/__set_app_type.c | 3 +++
11 files changed, 27 insertions(+)
diff --git a/mingw-w64-crt/def-include/crt-aliases.def.in
b/mingw-w64-crt/def-include/crt-aliases.def.in
index 01442717c6aa..4cb8e7042f68 100644
--- a/mingw-w64-crt/def-include/crt-aliases.def.in
+++ b/mingw-w64-crt/def-include/crt-aliases.def.in
@@ -506,6 +506,19 @@ F64(_wutime == _wutime64)
#endif
#endif
+#ifndef UCRTBASE
+; This is list of symbols which are present in UCRT but not in msvcrt
+#ifndef NO_LCONV_INIT_ALIAS
+__initialize_lconv_for_unsigned_char == __lconv_init
+#endif
+#ifdef WITH_QUERY_APP_TYPE_ALIAS
+_query_app_type == __get_app_type
+#endif
+#ifndef NO_SET_APP_TYPE_ALIAS
+_set_app_type == __set_app_type
+#endif
+#endif
+
; This is list of symbols which are present in msvcrt but not in UCRT
#ifdef UCRTBASE
__lconv_init == __initialize_lconv_for_unsigned_char
diff --git a/mingw-w64-crt/lib32/crtdll.def.in
b/mingw-w64-crt/lib32/crtdll.def.in
index 82cf0bcfa7e2..0956c86709f7 100644
--- a/mingw-w64-crt/lib32/crtdll.def.in
+++ b/mingw-w64-crt/lib32/crtdll.def.in
@@ -630,5 +630,7 @@ _ultow
#define NO_I64_FIXED_SIZE
#define NO_FPOS64_ALIASES
#define NO_STRCMPI_ALIAS
+#define NO_LCONV_INIT_ALIAS
+#define NO_SET_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcr80.def.in
b/mingw-w64-crt/lib32/msvcr80.def.in
index ec463fb14c31..a9a83d3d18fe 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in
@@ -1547,6 +1547,7 @@ _fread_nolock_s
fread_s
; Include symbol aliases for compatibility with msvcrt.dll
+#define WITH_QUERY_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_ATOLL_ALIAS
#define WITH_ATOLL_L_ALIAS
diff --git a/mingw-w64-crt/lib32/msvcr80d.def.in
b/mingw-w64-crt/lib32/msvcr80d.def.in
index 27119524c51b..96e77b274711 100644
--- a/mingw-w64-crt/lib32/msvcr80d.def.in
+++ b/mingw-w64-crt/lib32/msvcr80d.def.in
@@ -1625,6 +1625,7 @@ _fread_nolock_s
fread_s
; Include symbol aliases for compatibility with msvcrt.dll
+#define WITH_QUERY_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_ATOLL_ALIAS
#define WITH_ATOLL_L_ALIAS
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in
b/mingw-w64-crt/lib32/msvcr90.def.in
index c39b4754713e..01f7cfa6f14c 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -1532,6 +1532,7 @@ wprintf_s
wscanf
wscanf_s
+#define WITH_QUERY_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_ATOLL_ALIAS
#define WITH_ATOLL_L_ALIAS
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in
b/mingw-w64-crt/lib32/msvcr90d.def.in
index 90e7cbd75f1d..c3f4767fae77 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -1604,6 +1604,7 @@ wprintf_s
wscanf
wscanf_s
+#define WITH_QUERY_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_ATOLL_ALIAS
#define WITH_ATOLL_L_ALIAS
diff --git a/mingw-w64-crt/lib32/msvcrt10.def.in
b/mingw-w64-crt/lib32/msvcrt10.def.in
index 0f99e6ab3f7c..d353493c9437 100644
--- a/mingw-w64-crt/lib32/msvcrt10.def.in
+++ b/mingw-w64-crt/lib32/msvcrt10.def.in
@@ -1300,5 +1300,7 @@ wscanf
#define NO_I64_FIXED_SIZE
#define NO_FPOS64_ALIASES
#define NO_STRCMPI_ALIAS
+#define NO_LCONV_INIT_ALIAS
+#define NO_SET_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#include "crt-aliases.def.in"
diff --git a/mingw-w64-crt/lib32/msvcrt20.def.in
b/mingw-w64-crt/lib32/msvcrt20.def.in
index 781f86abd9fa..9c1bafb21a5d 100644
--- a/mingw-w64-crt/lib32/msvcrt20.def.in
+++ b/mingw-w64-crt/lib32/msvcrt20.def.in
@@ -1582,6 +1582,7 @@ _safe_fprem1
#define NO_FPOS64_ALIASES
#define NO_STRCMPI_ALIAS
#define NO_DSTBIAS
+#define NO_SET_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_IOB_FUNC_ALIAS
#define WITH_TZ_ALIASES
diff --git a/mingw-w64-crt/lib64/msvcr90.def.in
b/mingw-w64-crt/lib64/msvcr90.def.in
index 73de42453b4c..591ac9fd2964 100644
--- a/mingw-w64-crt/lib64/msvcr90.def.in
+++ b/mingw-w64-crt/lib64/msvcr90.def.in
@@ -1480,6 +1480,7 @@ wprintf_s
wscanf
wscanf_s
+#define WITH_QUERY_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_ATOLL_ALIAS
#define WITH_ATOLL_L_ALIAS
diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in
b/mingw-w64-crt/lib64/msvcr90d.def.in
index 87f8d48b0219..5b2532e1bc65 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def.in
+++ b/mingw-w64-crt/lib64/msvcr90d.def.in
@@ -1546,6 +1546,7 @@ wprintf_s
wscanf
wscanf_s
+#define WITH_QUERY_APP_TYPE_ALIAS
#define WITH_NEXTAFTER_ALIAS
#define WITH_ATOLL_ALIAS
#define WITH_ATOLL_L_ALIAS
diff --git a/mingw-w64-crt/misc/__set_app_type.c
b/mingw-w64-crt/misc/__set_app_type.c
index 684cf15b5616..8831653cfb03 100644
--- a/mingw-w64-crt/misc/__set_app_type.c
+++ b/mingw-w64-crt/misc/__set_app_type.c
@@ -11,3 +11,6 @@ void __cdecl __set_app_type (int type) {
}
void (__cdecl *__MINGW_IMP_SYMBOL(__set_app_type))(int) = __set_app_type;
+
+void __attribute__((alias("__set_app_type"))) __cdecl _set_app_type(int);
+extern void
__attribute__((alias(__MINGW64_STRINGIFY(__MINGW_IMP_SYMBOL(__set_app_type)))))
(__cdecl *__MINGW_IMP_SYMBOL(_set_app_type))(int);
--
2.20.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
