[w3m-dev 04240] nl_langinfo() requires setlocale()

This commit is contained in:
Dai Sato
2007-05-23 12:34:20 +00:00
parent 599bb41857
commit e4305ca608
6 changed files with 24 additions and 13 deletions

10
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.103 2006/12/10 11:01:24 inu Exp $ */
/* $Id: rc.c,v 1.104 2007/05/23 12:34:20 inu Exp $ */
/*
* Initialization file etc.
*/
@@ -790,8 +790,10 @@ show_params(FILE * fp)
char *t = NULL;
char *cmt;
#if ENABLE_NLS
#ifdef USE_M17N
#ifdef ENABLE_NLS
OptionCharset = SystemCharset; /* FIXME */
#endif
#endif
fputs("\nconfiguration parameters\n", fp);
@@ -1310,10 +1312,10 @@ load_option_panel(void)
if (optionpanel_str == NULL)
optionpanel_str = Sprintf(optionpanel_src1, w3m_version,
html_quote(localCookie()->ptr), _(CMT_HELPER));
#if ENABLE_NLS
#ifdef USE_M17N
#ifdef ENABLE_NLS
OptionCharset = SystemCharset; /* FIXME */
#endif
#ifdef USE_M17N
if (!OptionEncode) {
optionpanel_str =
wc_Str_conv(optionpanel_str, OptionCharset, InnerCharset);