From: maximilian attems <max@stro.at>
Date: Thu, 31 May 2012 17:40:49 +0000 (+0200)
Subject: lib/strutils: circumvent missing localeconv()
X-Git-Tag: v2.22-rc1~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab65d635c8bb11b9343e727f8e73e7d718322e1e;p=thirdparty%2Futil-linux.git

lib/strutils: circumvent missing localeconv()

Add stub too nls.h, include it instead of locale.h.
Code in strutils handles already returned NULL.

Signed-off-by: maximilian attems <max@stro.at>
---

diff --git a/include/nls.h b/include/nls.h
index 9a9311bdcc..3eabfe63b3 100644
--- a/include/nls.h
+++ b/include/nls.h
@@ -12,6 +12,12 @@ int main(int argc, char *argv[]);
 #else
 # undef setlocale
 # define setlocale(Category, Locale) /* empty */
+struct lconv
+{
+	char *decimal_point;
+};
+# undef localeconv
+# define localeconv() NULL
 #endif
 
 #ifdef ENABLE_NLS
diff --git a/lib/strutils.c b/lib/strutils.c
index 6bdc01d380..036ae06398 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -9,10 +9,10 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <locale.h>
 #include <string.h>
 
 #include "c.h"
+#include "nls.h"
 #include "strutils.h"
 #include "bitops.h"