From: Waldemar Kozaczuk <[email protected]>
Committer: Waldemar Kozaczuk <[email protected]>
Branch: master

libc: replace locale/wcscoll*.c (from old musl) with musl copy of 
locale/wcscoll.c

Signed-off-by: Waldemar Kozaczuk <[email protected]>
Message-Id: <[email protected]>

---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1060,8 +1060,7 @@ musl += locale/towctrans_l.o
 musl += locale/towlower_l.o
 musl += locale/towupper_l.o
 libc += locale/uselocale.o
-libc += locale/wcscoll.o
-libc += locale/wcscoll_l.o
+musl += locale/wcscoll.o
 libc += locale/wcsftime_l.o
 musl += locale/wcsxfrm.o
 musl += locale/wctrans_l.o
diff --git a/libc/locale/wcscoll.c b/libc/locale/wcscoll.c
--- a/libc/locale/wcscoll.c
+++ b/libc/locale/wcscoll.c
@@ -1,7 +0,0 @@
-#include <wchar.h>
-
-/* FIXME: stub */
-int wcscoll(const wchar_t *l, const wchar_t *r)
-{
-       return wcscmp(l, r);
-}
diff --git a/libc/locale/wcscoll_l.c b/libc/locale/wcscoll_l.c
--- a/libc/locale/wcscoll_l.c
+++ b/libc/locale/wcscoll_l.c
@@ -1,10 +0,0 @@
-#include <wchar.h>
-#include "libc.h"
-
-int __wcscoll_l(const wchar_t *l, const wchar_t *r, locale_t locale)
-{
-       return wcscoll(l, r);
-}
-
-/* OSv local: a libstdc++ build against glibc wants the __ version */
-weak_alias(__wcscoll_l, wcscoll_l);

-- 
You received this message because you are subscribed to the Google Groups "OSv 
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/osv-dev/00000000000061d25a05ad476bd9%40google.com.

Reply via email to