dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ICONV_CONST for portability.
[gedcom-parse.git]
/
utf8
/
utf8-locale.c
diff --git
a/utf8/utf8-locale.c
b/utf8/utf8-locale.c
index 1b3e255cc6fb062ca0d9b69ed51f3446d3cc5025..6db205bd762778d4c1f3ea0c00db957ca35f82e6 100644
(file)
--- a/
utf8/utf8-locale.c
+++ b/
utf8/utf8-locale.c
@@
-11,10
+11,11
@@
#include <stdlib.h>
#include <iconv.h>
#include <stdlib.h>
#include <iconv.h>
-#include <langinfo.h>
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
+#include <string.h>
#include "config.h"
#include "config.h"
+#include "libcharset.h"
#include "utf8-locale.h"
#define INITIAL_OUTSIZE 256
#include "utf8-locale.h"
#define INITIAL_OUTSIZE 256
@@
-43,11
+44,11
@@
int open_conversion_contexts()
{
assert(utf8_to_locale == (iconv_t) -1);
assert(locale_to_utf8 == (iconv_t) -1);
{
assert(utf8_to_locale == (iconv_t) -1);
assert(locale_to_utf8 == (iconv_t) -1);
- utf8_to_locale = iconv_open(
nl_langinfo(CODESET
), "UTF-8");
+ utf8_to_locale = iconv_open(
locale_charset(
), "UTF-8");
if (utf8_to_locale == (iconv_t) -1)
return -1;
else {
if (utf8_to_locale == (iconv_t) -1)
return -1;
else {
- locale_to_utf8 = iconv_open("UTF-8",
nl_langinfo(CODESET
));
+ locale_to_utf8 = iconv_open("UTF-8",
locale_charset(
));
if (locale_to_utf8 == (iconv_t) -1) {
close_conversion_contexts();
return -1;
if (locale_to_utf8 == (iconv_t) -1) {
close_conversion_contexts();
return -1;