prepare strcoll/wcscoll for LC_COLLATE support and add ABI symbols

diff --git a/src/locale/strcoll.c b/src/locale/strcoll.c
index 30bccd621ca9b6f377eb2817879ae1ca5fd7b49c..8b84b1e63d2971ed1f809a4161fc6da204cc2e80 100644 (file)
--- a/src/locale/strcoll.c
+++ b/src/locale/strcoll.c
@@ -1,6 +1,15 @@
 #include <string.h>
+#include <locale.h>
+#include "libc.h"
 
-int strcoll(const char *l, const char *r)
+int __strcoll_l(const char *l, const char *r, locale_t loc)
 {
        return strcmp(l, r);
 }
+
+int strcoll(const char *l, const char *r)
+{
+       return __strcoll_l(l, r, LC_GLOBAL_LOCALE);
+}
+
+weak_alias(__strcoll_l, strcoll_l);

diff --git a/src/locale/strcoll_l.c b/src/locale/strcoll_l.c
deleted file mode 100644 (file)
index 7948b0d..0000000
--- a/src/locale/strcoll_l.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <string.h>
-#include <locale.h>
-
-int strcoll_l(const char *l, const char *r, locale_t loc)
-{
-       return strcoll(l, r);
-}

diff --git a/src/locale/wcscoll.c b/src/locale/wcscoll.c
index cdbce1c24cc45f0b6ca4bbc90235f4ae61856351..95a4ca74e9b86ce1ac73018d0b318f92f9861ca0 100644 (file)
--- a/src/locale/wcscoll.c
+++ b/src/locale/wcscoll.c
@@ -1,7 +1,16 @@
 #include <wchar.h>
+#include <locale.h>
+#include "libc.h"
 
 /* FIXME: stub */
-int wcscoll(const wchar_t *l, const wchar_t *r)
+int __wcscoll_l(const wchar_t *l, const wchar_t *r, locale_t locale)
 {
        return wcscmp(l, r);
 }
+
+int wcscoll(const wchar_t *l, const wchar_t *r)
+{
+       return __wcscoll_l(l, r, LC_GLOBAL_LOCALE);
+}
+
+weak_alias(__wcscoll_l, wcscoll_l);

diff --git a/src/locale/wcscoll_l.c b/src/locale/wcscoll_l.c
deleted file mode 100644 (file)
index f257ec8..0000000
--- a/src/locale/wcscoll_l.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wchar.h>
-
-int wcscoll_l(const wchar_t *l, const wchar_t *r, locale_t locale)
-{
-       return wcscoll(l, r);
-}