Signed-off-by: Jacek Caban <[email protected]>
---
mingw-w64-crt/Makefile.am | 2 +-
mingw-w64-crt/misc/assert.c | 31 -------------------------------
mingw-w64-headers/crt/assert.h | 3 +--
3 files changed, 2 insertions(+), 34 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/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
