From 87be54a135db6d9ad16fcffe72b05c8d23b0f089 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 24 Jul 2013 18:52:02 -0400
Subject: rework langinfo code for ABI compat and for use by time code

---
 src/locale/langinfo.c      | 10 ++++++++--
 src/locale/nl_langinfo_l.c |  7 -------
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 src/locale/nl_langinfo_l.c

(limited to 'src/locale')

diff --git a/src/locale/langinfo.c b/src/locale/langinfo.c
index 01593148..b4d53744 100644
--- a/src/locale/langinfo.c
+++ b/src/locale/langinfo.c
@@ -25,7 +25,7 @@ static const char c_time[] =
 static const char c_messages[] = "^[yY]\0" "^[nN]";
 static const char c_numeric[] = ".\0" "";
 
-char *__langinfo(nl_item item)
+char *__nl_langinfo_l(nl_item item, locale_t loc)
 {
 	int cat = item >> 16;
 	int idx = item & 65535;
@@ -58,4 +58,10 @@ char *__langinfo(nl_item item)
 	return (char *)str;
 }
 
-weak_alias(__langinfo, nl_langinfo);
+char *__nl_langinfo(nl_item item)
+{
+	return __nl_langinfo_l(item, LC_GLOBAL_LOCALE);
+}
+
+weak_alias(__nl_langinfo, nl_langinfo);
+weak_alias(__nl_langinfo_l, nl_langinfo_l);
diff --git a/src/locale/nl_langinfo_l.c b/src/locale/nl_langinfo_l.c
deleted file mode 100644
index b54db95c..00000000
--- a/src/locale/nl_langinfo_l.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <locale.h>
-#include <langinfo.h>
-
-char *nl_langinfo_l(nl_item item, locale_t l)
-{
-	return nl_langinfo(item);
-}
-- 
cgit v1.2.1