From 0f191361f2f3c4282cbd3ae618d8001619fb37ec Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Fri, 28 Oct 2016 09:29:54 +0000
Subject: [PATCH] newlib: add wcsftime()

git-svn-id: svn://kolibrios.org@6628 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 contrib/sdk/sources/newlib/libc/Makefile    | 5 +++--
 contrib/sdk/sources/newlib/libc/Tupfile.lua | 2 ++
 contrib/sdk/sources/newlib/libc/libc.ver    | 2 --
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/sdk/sources/newlib/libc/Makefile b/contrib/sdk/sources/newlib/libc/Makefile
index 4fcc04d25..9b13e2932 100644
--- a/contrib/sdk/sources/newlib/libc/Makefile
+++ b/contrib/sdk/sources/newlib/libc/Makefile
@@ -573,7 +573,7 @@ LIB_OBJS+=				\
 		$(PRINTF_OBJS)		\
 		$(MATH_OBJS)
 
-
+LIB_OBJS+= time/wcsftime.o
 
 shared: $(NAME).dll libdll.a
 
@@ -655,7 +655,8 @@ stdio/svfwscanf.o: stdio/vfwscanf.c
 stdio/vfiwscanf.o: stdio/vfwscanf.c
 	$(CC) $(CFLAGS) $(DEFINES) -DINTEGER_ONLY $(INCLUDES) stdio/vfwscanf.c -o $@
 
-
+time/wcsftime.o: time/strftime.c
+	$(CC) $(CFLAGS) $(DEFINES) -DMAKE_WCSFTIME $(INCLUDES) time/strftime.c -o $@
 
 
 %.obj : %.asm Makefile
diff --git a/contrib/sdk/sources/newlib/libc/Tupfile.lua b/contrib/sdk/sources/newlib/libc/Tupfile.lua
index 6ddd067d5..76b726b00 100644
--- a/contrib/sdk/sources/newlib/libc/Tupfile.lua
+++ b/contrib/sdk/sources/newlib/libc/Tupfile.lua
@@ -526,6 +526,8 @@ LIB_OBJS = compile(LIB_SRCS)
 LIB_OBJS += tup.rule("crt/crtdll.c", "kos32-gcc $(CFLAGS) $(DEFINES) $(INCLUDES) -fno-delete-null-pointer-checks -c %f -o %o","crt/crtdll.o")
 LIB_OBJS += tup.rule("pe/loader.c", "kos32-gcc $(CFLAGS) $(DEFINES) $(INCLUDES) -fno-delete-null-pointer-checks -c %f -o %o", "pe/loader.o")
 LIB_OBJS += tup.rule("reent/renamer.c", "kos32-gcc $(CFLAGS) $(DEFINES) $(INCLUDES) -D_COMPILING_NEWLIB -c %f -o %o", "reent/renamer.o")
+LIB_OBJS += tup.rule("time/strftime.c", "kos32-gcc $(CFLAGS) $(DEFINES) -DMAKE_WCSFTIME $(INCLUDES) -c %f -o %o", "time/wcsftime.o")
+
 
 LIBDLL_OBJS = compile(LIBDLL_SRCS)
 
diff --git a/contrib/sdk/sources/newlib/libc/libc.ver b/contrib/sdk/sources/newlib/libc/libc.ver
index f14664b6b..367fcdeea 100644
--- a/contrib/sdk/sources/newlib/libc/libc.ver
+++ b/contrib/sdk/sources/newlib/libc/libc.ver
@@ -105,9 +105,7 @@ LIBC {
             __kernel_tanf;
             __libc_getenv;
             __lo0bits;
-            __locale_charset;
             __locale_cjk_lang;
-            __locale_mb_cur_max;
             __locale_msgcharset;
             __lshift;
             __mb_cur_max;