From 683e546c2d75b70590455f4be0b7592664d6a024 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Sun, 5 Oct 2003 18:52:50 +0000 Subject: 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 --- fm.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'fm.h') diff --git a/fm.h b/fm.h index 89ef44e..20d3ee4 100644 --- a/fm.h +++ b/fm.h @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.123 2003/09/26 20:45:53 ukai Exp $ */ +/* $Id: fm.h,v 1.124 2003/10/05 18:52:51 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -39,12 +39,11 @@ #include "html.h" #include #include "Str.h" -#if LANG == JA -#define USE_M17N -#endif /* LANG == JA */ #ifdef USE_M17N #include "wc.h" #include "wtf.h" +#else +typedef int wc_ces; /* XXX: not used */ #endif #ifdef HAVE_LOCALE_H @@ -1036,8 +1035,8 @@ global char SearchConv init(TRUE); #define conv_from_system(x) (x) #define conv_to_system(x) (x) #define url_quote_conv(x,c) url_quote(x) -#define wc_Str_conv(x) (x) -#define wc_Str_conv_strict(x) (x) +#define wc_Str_conv(x,charset0,charset1) (x) +#define wc_Str_conv_strict(x,charset0,charset1) (x) #endif global char UseAltEntity init(TRUE); global char UseGraphicChar init(FALSE); -- cgit v1.2.3