* [PATCH] lib/strutils: circumvent missing localeconv()
@ 2012-05-31 17:40 maximilian attems
2012-06-05 13:01 ` Karel Zak
0 siblings, 1 reply; 2+ messages in thread
From: maximilian attems @ 2012-05-31 17:40 UTC (permalink / raw)
To: util-linux; +Cc: maximilian attems
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>
---
include/nls.h | 6 ++++++
lib/strutils.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/nls.h b/include/nls.h
index 9a9311b..3eabfe6 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 6bdc01d..036ae06 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"
--
1.7.10
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] lib/strutils: circumvent missing localeconv()
2012-05-31 17:40 [PATCH] lib/strutils: circumvent missing localeconv() maximilian attems
@ 2012-06-05 13:01 ` Karel Zak
0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2012-06-05 13:01 UTC (permalink / raw)
To: maximilian attems; +Cc: util-linux
On Thu, May 31, 2012 at 07:40:49PM +0200, maximilian attems wrote:
> include/nls.h | 6 ++++++
> lib/strutils.c | 2 +-
> 2 files changed, 7 insertions(+), 1 deletion(-)
Applied, thanks.
--
Karel Zak <kzak@redhat.com>
http://karelzak.blogspot.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-05 13:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-31 17:40 [PATCH] lib/strutils: circumvent missing localeconv() maximilian attems
2012-06-05 13:01 ` Karel Zak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).