diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-10-05 18:52:50 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-10-05 18:52:50 +0000 |
| commit | 683e546c2d75b70590455f4be0b7592664d6a024 (patch) | |
| tree | 8839ce0e2351c28cc98107af994e451a4e292e26 /mimehead.c | |
| parent | * --with-imagelib request on [w3m-dev 03981] (diff) | |
| download | w3m-683e546c2d75b70590455f4be0b7592664d6a024.tar.gz w3m-683e546c2d75b70590455f4be0b7592664d6a024.zip | |
fix build error --disbable-m17n
* config.h.in: undef USE_M17N, USE_UNICODE
* etc.c (url_unquote_conv): USE_M17N
* file.c (convertLine): USE_M17N
(loadHTMLStream): fix ifdef USE_IMAGE->USE_M17N
(loadBuffer): fix USE_M17N
(getNextPage): fix USE_M17N
* fm.h (USE_M17N): don't define USE_M17N in case LANG == JA
(this should be done by configure)
(wc_ces): dummy typedef
(wc_Str_conv): fix non-m17n macro args
(wc_Str_conv_strict): ditto
* ftp.c (loadFTPDir): fix undefined USE_M17N
* mimehead.c (decodeWord): ditto
(decodeMIME): ditto
* news.c (loadNewsgroup): ditto
* proto.h (convertLine): ditto
(loadGopherDir): ditto
(loadFTPDir): ditto
(loadNewsgroup): ditto
(decodeWord): ditto
(decodeMIME): ditto
(url_unquote_conv): ditto
* terms.c (SETCH): ditto
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to 'mimehead.c')
| -rw-r--r-- | mimehead.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: mimehead.c,v 1.9 2003/09/22 21:02:20 ukai Exp $ */ +/* $Id: mimehead.c,v 1.10 2003/10/05 18:52:51 ukai Exp $ */ /* * MIME header support by Akinori ITO */ @@ -191,8 +191,13 @@ decodeQP(char **ww) return a; } +#ifdef USE_M17N Str decodeWord(char **ow, wc_ces * charset) +#else +Str +decodeWord0(char **ow) +#endif { #ifdef USE_M17N wc_ces c; @@ -215,7 +220,7 @@ decodeWord(char **ow, wc_ces * charset) if (!c) goto convert_fail; #else - if (strcasecmp(buf, "ISO-8859-1") != 0 && strcasecmp(buf, "US_ASCII") != 0) + if (strcasecmp(tmp->ptr, "ISO-8859-1") != 0 && strcasecmp(tmp->ptr, "US_ASCII") != 0) /* NOT ISO-8859-1 encoding ... don't convert */ goto convert_fail; #endif @@ -255,8 +260,13 @@ decodeWord(char **ow, wc_ces * charset) /* * convert MIME encoded string to the original one */ +#ifdef USE_M17N Str decodeMIME(Str orgstr, wc_ces * charset) +#else +Str +decodeMIME0(Str orgstr) +#endif { char *org = orgstr->ptr, *endp = org + orgstr->length; char *org0, *p; |