On Fri, 24 Nov 2017, Jacek Caban wrote:

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

Since ucrtbase doesn't have these functions, I guess it'd make more sense to move this into the #ifndef block below?

Looks ok to me otherwise though - feel free to go ahead.

// Martin

------------------------------------------------------------------------------
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

Reply via email to