Signed-off-by: Jacek Caban <[email protected]>
---
mingw-w64-crt/Makefile.am | 2 +-
.../api-ms-win-crt-runtime-l1-1-0.def.in | 2 +-
mingw-w64-crt/lib-common/msvcrt.def.in | 2 +-
mingw-w64-crt/lib-common/ucrtbase.def.in | 2 +-
mingw-w64-crt/lib32/msvcr100.def.in | 2 +-
mingw-w64-crt/lib32/msvcr80.def.in | 2 +-
mingw-w64-crt/lib32/msvcr90.def.in | 2 +-
mingw-w64-crt/lib32/msvcr90d.def.in | 2 +-
mingw-w64-crt/lib64/msvcr100.def.in | 2 +-
mingw-w64-crt/lib64/msvcr80.def.in | 2 +-
mingw-w64-crt/lib64/msvcr90.def.in | 2 +-
mingw-w64-crt/lib64/msvcr90d.def.in | 2 +-
mingw-w64-crt/misc/assert.c | 31 -------------------
mingw-w64-headers/crt/assert.h | 3 +-
14 files changed, 13 insertions(+), 45 deletions(-)
delete mode 100644 mingw-w64-crt/misc/assert.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index e19beaaf..0af497af 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -314,7 +314,7 @@ src_libmingwex=\
misc/mb_wc_common.h \
misc/mingw_getsp.S \
misc/alarm.c \
- misc/assert.c misc/basename.c misc/btowc.c misc/delay-f.c misc/delay-n.c \
+ misc/basename.c misc/btowc.c misc/delay-f.c misc/delay-n.c \
misc/delayimp.c misc/difftime.c misc/difftime32.c misc/difftime64.c misc/dirent.c \
misc/dirname.c misc/execv.c misc/execve.c misc/execvp.c misc/execvpe.c \
misc/feclearexcept.c misc/fegetenv.c misc/fegetexceptflag.c misc/fegetround.c misc/feholdexcept.c \
diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in b/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
index eb299b86..365f507b 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
@@ -24,7 +24,7 @@ __threadid
__wcserror
__wcserror_s
; DATA set manually
-_assert DATA
+_asserr
_beginthread
_beginthreadex
_c_exit
diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in b/mingw-w64-crt/lib-common/msvcrt.def.in
index 449beb0a..d75f45ba 100644
--- a/mingw-w64-crt/lib-common/msvcrt.def.in
+++ b/mingw-w64-crt/lib-common/msvcrt.def.in
@@ -376,7 +376,7 @@ F_ARM_ANY(_aligned_offset_realloc_dbg)
_aligned_realloc
F_ARM_ANY(_aligned_realloc_dbg)
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in
index d5e7a630..72dc6af8 100644
--- a/mingw-w64-crt/lib-common/ucrtbase.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase.def.in
@@ -203,7 +203,7 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
; DATA set manually
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib32/msvcr100.def.in b/mingw-w64-crt/lib32/msvcr100.def.in
index 1c6ae3dc..26cded52 100644
--- a/mingw-w64-crt/lib32/msvcr100.def.in
+++ b/mingw-w64-crt/lib32/msvcr100.def.in
@@ -731,7 +731,7 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in
index f5e95550..243da0b3 100644
--- a/mingw-w64-crt/lib32/msvcr80.def.in
+++ b/mingw-w64-crt/lib32/msvcr80.def.in
@@ -111,7 +111,7 @@ _adj_fptan
_adjust_fdiv DATA
_aexit_rtn DATA
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atoi64
_atoldbl
diff --git a/mingw-w64-crt/lib32/msvcr90.def.in b/mingw-w64-crt/lib32/msvcr90.def.in
index c341951a..d5907a2a 100644
--- a/mingw-w64-crt/lib32/msvcr90.def.in
+++ b/mingw-w64-crt/lib32/msvcr90.def.in
@@ -356,7 +356,7 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib32/msvcr90d.def.in b/mingw-w64-crt/lib32/msvcr90d.def.in
index 2fe211dd..8c7ed546 100644
--- a/mingw-w64-crt/lib32/msvcr90d.def.in
+++ b/mingw-w64-crt/lib32/msvcr90d.def.in
@@ -407,7 +407,7 @@ _aligned_realloc_dbg
_aligned_recalloc
_aligned_recalloc_dbg
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib64/msvcr100.def.in b/mingw-w64-crt/lib64/msvcr100.def.in
index 68c09d6c..6e3b9470 100644
--- a/mingw-w64-crt/lib64/msvcr100.def.in
+++ b/mingw-w64-crt/lib64/msvcr100.def.in
@@ -689,7 +689,7 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in
index 2372e2e6..c7a1f83f 100644
--- a/mingw-w64-crt/lib64/msvcr80.def.in
+++ b/mingw-w64-crt/lib64/msvcr80.def.in
@@ -192,7 +192,7 @@ _aligned_offset_malloc
_aligned_offset_realloc
_aligned_realloc
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atoi64
_atoldbl
diff --git a/mingw-w64-crt/lib64/msvcr90.def.in b/mingw-w64-crt/lib64/msvcr90.def.in
index cf01dc0c..a303d168 100644
--- a/mingw-w64-crt/lib64/msvcr90.def.in
+++ b/mingw-w64-crt/lib64/msvcr90.def.in
@@ -304,7 +304,7 @@ _aligned_offset_recalloc
_aligned_realloc
_aligned_recalloc
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/lib64/msvcr90d.def.in b/mingw-w64-crt/lib64/msvcr90d.def.in
index 99b167ee..afba0448 100644
--- a/mingw-w64-crt/lib64/msvcr90d.def.in
+++ b/mingw-w64-crt/lib64/msvcr90d.def.in
@@ -349,7 +349,7 @@ _aligned_realloc_dbg
_aligned_recalloc
_aligned_recalloc_dbg
_amsg_exit
-_assert DATA
+_asserr
_atodbl
_atodbl_l
_atof_l
diff --git a/mingw-w64-crt/misc/assert.c b/mingw-w64-crt/misc/assert.c
deleted file mode 100644
index 0bebb7e9..00000000
--- a/mingw-w64-crt/misc/assert.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <signal.h>
-
-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);
-}
diff --git a/mingw-w64-headers/crt/assert.h b/mingw-w64-headers/crt/assert.h
index 0d7b1f16..4004a959 100644
--- a/mingw-w64-headers/crt/assert.h
+++ b/mingw-w64-headers/crt/assert.h
@@ -44,8 +44,7 @@ extern "C" {
extern void __cdecl
_wassert(const wchar_t *_Message,const wchar_t *_File,unsigned _Line);
-extern void __cdecl
-_assert (const char *_Message, const char *_File, unsigned _Line);
+_CRTIMP void __cdecl _assert (const char *_Message, const char *_File, unsigned _Line);
#ifdef __cplusplus
}
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
