regen patches

This commit is contained in:
sthen 2010-07-30 19:57:12 +00:00
parent b29ad43956
commit 1499deb94c

View File

@ -1,9 +1,20 @@
$OpenBSD: patch-src_readxml_c,v 1.3 2005/12/15 04:19:57 jolan Exp $
--- src/readxml.c.orig Mon Jan 31 20:26:19 2005
+++ src/readxml.c Wed Dec 14 22:16:14 2005
@@ -36,0 +37,2 @@
$OpenBSD: patch-src_readxml_c,v 1.4 2010/07/30 19:57:12 sthen Exp $
--- src/readxml.c.orig Thu Jan 11 01:43:37 2007
+++ src/readxml.c Fri Jul 30 20:55:22 2010
@@ -34,6 +34,7 @@
#include <langinfo.h>
#include <locale.h>
#endif
+#include <localcharset.h>
+
@@ -210 +212 @@
int parser_err=0, parser_acceptbody=0;
@@ -227,7 +228,7 @@ static iconv_t get_conv()
}
} else
fprintf(stderr,"WARN: Error reading locale (%m), assuming C\n");
- enc=nl_langinfo(CODESET);
+ enc=locale_charset();
fprintf(stderr,"INFO: Converting filenames to %s\n",enc);
ic=iconv_open(enc,"UTF-8");
if( ic==((iconv_t)-1) ) {