Always import _assert from msvcrt
Only use _wassert replacement for msvcrt.dll
---
mingw-w64-crt/def-include/msvcrt-common.def.in | 2 ++
mingw-w64-crt/lib32/msvcr100.def.in | 3 +--
mingw-w64-crt/lib32/msvcr110.def.in | 1 -
mingw-w64-crt/lib32/msvcr80.def.in | 2 +-
mingw-w64-crt/lib32/msvcr90.def.in | 3 +--
mingw-w64-crt/lib32/msvcr90d.def.in | 3 +--
mingw-w64-crt/lib32/msvcrt.def.in | 2 +-
mingw-w64-crt/lib64/msvcr100.def.in | 3 +--
mingw-w64-crt/lib64/msvcr110.def.in | 1 -
mingw-w64-crt/lib64/msvcr80.def.in | 2 +-
mingw-w64-crt/lib64/msvcr90.def.in | 3 +--
mingw-w64-crt/lib64/msvcr90d.def.in | 3 +--
mingw-w64-crt/lib64/msvcrt.def.in | 2 +-
mingw-w64-crt/misc/wassert.c | 21 ---------------------
mingw-w64-headers/crt/assert.h | 4 ++--
15 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in
b/mingw-w64-crt/def-include/msvcrt-common.def.in
index 76e1fa3..8e00964 100644
--- a/mingw-w64-crt/def-include/msvcrt-common.def.in
+++ b/mingw-w64-crt/def-include/msvcrt-common.def.in
@@ -133,3 +133,5 @@ ADD_UNDERSCORE(timezone)
ADD_UNDERSCORE(tzname)
longjmp DATA
+
+_assert
diff --git a/mingw-w64-crt/lib32/msvcr100.def.in
b/mingw-w64-crt/lib32/msvcr100.def.in
index 813e79a..d9a34b3 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in
@@ -731,7 +731,6 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1517,7 +1516,7 @@ _waccess
_waccess_s
_wasctime
_wasctime_s
-_wassert DATA
+_wassert
_wchdir
_wchmod
_wcmdln DATA
diff --git a/mingw-w64-crt/lib32/msvcr110.def.in
b/mingw-w64-crt/lib32/msvcr110.def.in
index be2eea3..d496749 100644
--- a/mingw-w64-crt/lib32/msvcr110.def.in
+++ b/mingw-w64-crt/lib32/msvcr110.def.in
@@ -855,7 +855,6 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit ; Check!!! Couldn't determine function argument count. Function
doesn't return.
-_assert
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib32/msvcr80.def.in
b/mingw-w64-crt/lib32/msvcr80.def.in
index d61fafc..f7e8937 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in
@@ -110,7 +110,6 @@ _adj_fptan
_adjust_fdiv DATA
_aexit_rtn DATA
_amsg_exit
-_assert DATA
_atodbl
_atoi64
_atoldbl
@@ -815,3 +814,4 @@ __pwctype_func
_get_heap_handle
_set_purecall_handler
_set_SSE2_enable
+_wassert
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in
b/mingw-w64-crt/lib32/msvcr90.def.in
index 6459d47..409ac0c 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -356,7 +356,6 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1151,7 +1150,7 @@ _waccess
_waccess_s
_wasctime
_wasctime_s
-_wassert DATA
+_wassert
_wchdir
_wchmod
_wcmdln DATA
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in
b/mingw-w64-crt/lib32/msvcr90d.def.in
index 7897686..b94dcba 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -407,7 +407,6 @@ _aligned_realloc_dbg
_aligned_recalloc
_aligned_recalloc_dbg
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1217,7 +1216,7 @@ _waccess
_waccess_s
_wasctime
_wasctime_s
-_wassert DATA
+_wassert
_wchdir
_wchmod
_wcmdln DATA
diff --git a/mingw-w64-crt/lib32/msvcrt.def.in
b/mingw-w64-crt/lib32/msvcrt.def.in
index 896783b..1a3385e 100644
--- a/mingw-w64-crt/lib32/msvcrt.def.in
+++ b/mingw-w64-crt/lib32/msvcrt.def.in
@@ -110,7 +110,6 @@ _adj_fptan
_adjust_fdiv DATA
_aexit_rtn DATA
_amsg_exit
-_assert DATA
_atodbl
_atoi64
_atoldbl
@@ -1233,3 +1232,4 @@ wcstombs_s
wctomb_s
wprintf_s
wscanf_s
+_wassert DATA
diff --git a/mingw-w64-crt/lib64/msvcr100.def.in
b/mingw-w64-crt/lib64/msvcr100.def.in
index 5fa35ce..e6268f0 100644
--- a/mingw-w64-crt/lib64/msvcr100.def.in
+++ b/mingw-w64-crt/lib64/msvcr100.def.in
@@ -689,7 +689,6 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1464,7 +1463,7 @@ _waccess
_waccess_s
_wasctime
_wasctime_s
-_wassert DATA
+_wassert
_wchdir
_wchmod
_wcmdln DATA
diff --git a/mingw-w64-crt/lib64/msvcr110.def.in
b/mingw-w64-crt/lib64/msvcr110.def.in
index eed717e..d05cd0f 100644
--- a/mingw-w64-crt/lib64/msvcr110.def.in
+++ b/mingw-w64-crt/lib64/msvcr110.def.in
@@ -815,7 +815,6 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib64/msvcr80.def.in
b/mingw-w64-crt/lib64/msvcr80.def.in
index d29dc2a..6c54ad4 100644
--- a/mingw-w64-crt/lib64/msvcr80.def.in
+++ b/mingw-w64-crt/lib64/msvcr80.def.in
@@ -191,7 +191,6 @@ _aligned_offset_malloc
_aligned_offset_realloc
_aligned_realloc
_amsg_exit
-_assert DATA
_atodbl
_atoi64
_atoldbl
@@ -868,3 +867,4 @@ wcsxfrm
wctomb
wprintf
wscanf
+_wassert
diff --git a/mingw-w64-crt/lib64/msvcr90.def.in
b/mingw-w64-crt/lib64/msvcr90.def.in
index e2bbacf..7aec06d 100644
--- a/mingw-w64-crt/lib64/msvcr90.def.in
+++ b/mingw-w64-crt/lib64/msvcr90.def.in
@@ -304,7 +304,6 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1084,7 +1083,7 @@ _waccess
_waccess_s
_wasctime
_wasctime_s
-_wassert DATA
+_wassert
_wchdir
_wchmod
_wcmdln DATA
diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in
b/mingw-w64-crt/lib64/msvcr90d.def.in
index 5a9c76b..d88b4cc 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def.in
+++ b/mingw-w64-crt/lib64/msvcr90d.def.in
@@ -349,7 +349,6 @@ _aligned_realloc_dbg
_aligned_recalloc
_aligned_recalloc_dbg
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1144,7 +1143,7 @@ _waccess
_waccess_s
_wasctime
_wasctime_s
-_wassert DATA
+_wassert
_wchdir
_wchmod
_wcmdln DATA
diff --git a/mingw-w64-crt/lib64/msvcrt.def.in
b/mingw-w64-crt/lib64/msvcrt.def.in
index 3227d29..3751606 100644
--- a/mingw-w64-crt/lib64/msvcrt.def.in
+++ b/mingw-w64-crt/lib64/msvcrt.def.in
@@ -193,7 +193,6 @@ _aligned_offset_malloc
_aligned_offset_realloc
_aligned_realloc
_amsg_exit
-_assert DATA
_atodbl
_atodbl_l
_atof_l
@@ -1279,3 +1278,4 @@ wprintf
wprintf_s
wscanf
wscanf_s
+_wassert DATA
diff --git a/mingw-w64-crt/misc/wassert.c b/mingw-w64-crt/misc/wassert.c
index 5b66fbd..4ddd765 100644
--- a/mingw-w64-crt/misc/wassert.c
+++ b/mingw-w64-crt/misc/wassert.c
@@ -11,27 +11,6 @@
extern int mingw_app_type;
-void __cdecl _wassert (const wchar_t *, const wchar_t *,unsigned);
-void __cdecl _assert (const char *, const char *, unsigned);
-
-void __cdecl
-_assert (const char *_Message, const char *_File, unsigned _Line)
-{
- wchar_t *m, *f;
- int i;
- m = (wchar_t *) malloc ((strlen (_Message) + 1) * sizeof (wchar_t));
- f = (wchar_t *) malloc ((strlen (_File) + 1) * sizeof (wchar_t));
- for (i = 0; _Message[i] != 0; i++)
- m[i] = ((wchar_t) _Message[i]) & 0xff;
- m[i] = 0;
- for (i = 0; _File[i] != 0; i++)
- f[i] = ((wchar_t) _File[i]) & 0xff;
- f[i] = 0;
- _wassert (m, f, _Line);
- free (m);
- free (f);
-}
-
void __cdecl
_wassert (const wchar_t *_Message, const wchar_t *_File, unsigned _Line)
{
diff --git a/mingw-w64-headers/crt/assert.h b/mingw-w64-headers/crt/assert.h
index 2fd4d9c..2c376e7 100644
--- a/mingw-w64-headers/crt/assert.h
+++ b/mingw-w64-headers/crt/assert.h
@@ -42,9 +42,9 @@ extern "C" {
#endif /* _CRT_TERMINATE_DEFINED */
-extern void __cdecl
+_CRTIMP extern void __cdecl
_wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line);
-extern void __cdecl
+_CRTIMP extern void __cdecl
_assert (const char *_Message, const char *_File, unsigned _Line);
#ifdef __cplusplus
--
1.8.1.2
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
