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>

1 files changed, 27 insertions, 20 deletions

diff --git a/proto.h b/proto.h
index d5ad27a..0453795 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.96 2003/09/22 21:02:20 ukai Exp $ */
+/* $Id: proto.h,v 1.97 2003/10/05 18:52:51 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -168,12 +168,13 @@ extern int dir_exist(char *path);
 #ifdef USE_M17N
 extern char **get_symbol(wc_ces charset, int *width);
 extern char **set_symbol(int width);
+extern Str convertLine(URLFile *uf, Str line, int mode, wc_ces * charset,
+		       wc_ces doc_charset);
 #else
-#define convertLine(a,b,c,d,e) _convertLine(a,b,c)
 extern char **get_symbol(void);
+extern Str convertLine0(URLFile *uf, Str line, int mode);
+#define convertLine(uf,line,mode,charset,dcharset) convertLine0(uf,line,mode)
 #endif
-extern Str convertLine(URLFile *uf, Str line, int mode, wc_ces * charset,
-		       wc_ces doc_charset);
 extern void push_symbol(Str str, char symbol, int width, int n);
 extern Buffer *loadFile(char *path);
 extern Buffer *loadGeneralFile(char *path, ParsedURL *current, char *referer,
@@ -230,9 +231,6 @@ extern void loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src,
 			   int internal);
 extern Buffer *loadHTMLString(Str page);
 #ifdef USE_GOPHER
-#ifndef USE_M17N
-#define loadGopherDir(a,b,c) _loadGopherDir(a,b)
-#endif
 extern Str loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset);
 #endif				/* USE_GOPHER */
 extern Buffer *loadBuffer(URLFile *uf, Buffer *newBuf);
@@ -522,18 +520,22 @@ extern char *guessContentType(char *filename);
 extern TextList *make_domain_list(char *domain_list);
 extern int check_no_proxy(char *domain);
 extern InputStream openFTPStream(ParsedURL *pu, URLFile *uf);
-#ifndef USE_M17N
-#define loadFTPDir(a,b) _loadFTPDir(a)
-#endif
+#ifdef USE_M17N
 extern Str loadFTPDir(ParsedURL *pu, wc_ces * charset);
+#else
+extern Str loadFTPDir0(ParsedURL *pu);
+#define loadFTPDir(pu,charset)	loadFTPDir0(pu)
+#endif
 extern void closeFTP(void);
 extern void disconnectFTP(void);
 #ifdef USE_NNTP
 extern InputStream openNewsStream(ParsedURL *pu);
-#ifndef USE_M17N
-#define loadNewsgroup(a,b) _loadNewsgroup(a)
-#endif
+#ifdef USE_M17N
 extern Str loadNewsgroup(ParsedURL *pu, wc_ces * charset);
+#else
+extern Str loadNewsgroup0(ParsedURL *pu);
+#define loadNewsgroup(pu,charset) loadNewsgroup0(pu)
+#endif
 extern void closeNews(void);
 extern void disconnectNews(void);
 #endif
@@ -578,12 +580,15 @@ extern Str decodeB(char **ww);
 extern Str decodeQ(char **ww);
 extern Str decodeQP(char **ww);
 extern Str decodeU(char **ww);
-#ifndef USE_M17N
-#define decodeWord(a,b) _decodeWord(a)
-#define decodeMIME(a,b) _decodeMIME(a)
-#endif
+#ifdef USE_M17N
 extern Str decodeWord(char **ow, wc_ces * charset);
 extern Str decodeMIME(Str orgstr, wc_ces * charset);
+#else
+extern Str decodeWord0(char **ow);
+extern Str decodeMIME0(Str orgstr);
+#define decodeWord(ow,charset) decodeWord0(ow)
+#define decodeMIME(orgstr,charset) decodeMIME0(orgstr)
+#endif
 extern Str encodeB(char *a);
 extern int set_param_option(char *option);
 extern char *get_param_option(char *name);
@@ -619,10 +624,12 @@ extern void mySystem(char *command, int background);
 extern Str myExtCommand(char *cmd, char *arg, int redirect);
 extern Str myEditor(char *cmd, char *file, int line);
 extern char *file_to_url(char *file);
-#ifndef USE_M17N
-#define url_unquote_conv(a,b) _url_unquote_conv(a)
-#endif
+#ifdef USE_M17N
 extern char *url_unquote_conv(char *url, wc_ces charset);
+#else
+extern char *url_unquote_conv0(char *url);
+#define url_unquote_conv(url, charset) url_unquote_conv0(url)
+#endif
 extern char *expandName(char *name);
 extern Str tmpfname(int type, char *ext);
 extern time_t mymktime(char *timestr);