Signed-off-by: Jacek Caban <ja...@codeweavers.com>
---
mingw-w64-crt/Makefile.am | 2 +-
mingw-w64-crt/def-include/msvcrt-common.def.in | 2 ++
mingw-w64-crt/stdio/vsnprintf_s.c | 16 ----------------
3 files changed, 3 insertions(+), 17 deletions(-)
delete mode 100644 mingw-w64-crt/stdio/vsnprintf_s.c
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 322d2b68..b3ebafb0 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -327,7 +327,7 @@ src_libmingwex=\
stdio/mingw_vsnprintf.c stdio/mingw_vsnprintfw.c stdio/mingw_vsprintf.c stdio/mingw_vsprintfw.c stdio/mingw_wscanf.c \
stdio/mingw_wvfscanf.c stdio/snprintf.c stdio/snwprintf.c stdio/strtof.c stdio/truncate.c \
stdio/ulltoa.c stdio/ulltow.c stdio/vasprintf.c stdio/vfscanf.c stdio/vfwscanf.c \
- stdio/vscanf.c stdio/vsnprintf_s.c stdio/vsnwprintf.c stdio/vsscanf.c \
+ stdio/vscanf.c stdio/vsnwprintf.c stdio/vsscanf.c \
stdio/vswscanf.c stdio/vwscanf.c stdio/wtoll.c stdio/mingw_asprintf.c stdio/mingw_vasprintf.c
# these go into both 32 and 64 bit x86 versions:
diff --git a/mingw-w64-crt/def-include/msvcrt-common.def.in b/mingw-w64-crt/def-include/msvcrt-common.def.in
index 92f047fb..6c10b43b 100644
--- a/mingw-w64-crt/def-include/msvcrt-common.def.in
+++ b/mingw-w64-crt/def-include/msvcrt-common.def.in
@@ -125,6 +125,8 @@ ADD_UNDERSCORE(hypot)
;logb
ADD_UNDERSCORE(nextafter)
+ADD_UNDERSCORE(vsnprintf_s)
+
#ifndef UCRTBASE
_daylight DATA
_timezone DATA
diff --git a/mingw-w64-crt/stdio/vsnprintf_s.c b/mingw-w64-crt/stdio/vsnprintf_s.c
deleted file mode 100644
index 1618dbec..00000000
--- a/mingw-w64-crt/stdio/vsnprintf_s.c
+++ /dev/null
@@ -1,16 +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.
- */
-#define __CRT__NO_INLINE
-#include <stdarg.h>
-#include <stdio.h>
-
-int __cdecl vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList);
-_CRTIMP int __cdecl _vsnprintf_s(char *_DstBuf,size_t _DstSize,size_t _MaxCount,const char *_Format,va_list _ArgList);
-
-int __cdecl vsnprintf_s (char *s, size_t _DstSize, size_t _MaxCount, const char *format, va_list arg)
-{
- return _vsnprintf_s(s, _DstSize, _MaxCount, format, arg);
-}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
