commit c23722e75487cca3493fbe48bddb10c9185a8585
parent 8be56cc8afc264e126c59116ad27c16dd24ee5ad
Author: ukai <ukai>
Date: Mon, 22 Sep 2003 21:27:42 +0000
fix build problem
Diffstat:
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -166,7 +166,7 @@ wctarget:
RANLIB='$(RANLIB)'
dummy.o: entity.c
- $(CC) $(CFLAGS) -DDUMMY -o $@ $?
+ $(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
$(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS)
$(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o $(IMGOBJS) $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
diff --git a/entity.c b/entity.c
@@ -62,5 +62,5 @@ conv_entity(unsigned int c)
}
#endif
#endif
- return p ? p : "?";
+ return "?";
}
diff --git a/menu.c b/menu.c
@@ -1678,6 +1678,9 @@ interpret_menu(FILE * mf)
char *p, *s;
int in_menu = 0, nmenu = 0, nitem = 0, type;
MenuItem *item = NULL;
+#ifdef USE_M17N
+ wc_ces charset = SystemCharset;
+#endif
while (!feof(mf)) {
line = Strfgets(mf);
@@ -1718,6 +1721,14 @@ interpret_menu(FILE * mf)
nitem = 0;
item[nitem].type = MENU_END;
}
+#ifdef USE_M17N
+ else if (!strcmp(s, "charset") || !strcmp(s, "encoding")) {
+ s = getQWord(&p);
+ if (*s == '\0') /* error */
+ continue;
+ charset = wc_guess_charset(s, charset);
+ }
+#endif
}
}
@@ -1726,9 +1737,6 @@ initMenu(void)
{
FILE *mf;
MenuList *list;
-#ifdef USE_M17N
- wc_ces charset = SystemCharset;
-#endif
w3mMenuList = New_N(MenuList, 3);
w3mMenuList[0].id = "Main";
@@ -1744,6 +1752,7 @@ initMenu(void)
#ifdef USE_M17N
if (!MainMenuEncode) {
+ MenuItem *item;
for (item = MainMenuItem; item->type != MENU_END; item++)
item->label =
wc_conv(item->label, MainMenuCharset, InnerCharset)->ptr;
@@ -1938,14 +1947,6 @@ accesskey_menu(Buffer *buf)
ap[n] = a;
n++;
}
-#ifdef USE_M17N
- else if (!strcmp(s, "charset") || !strcmp(s, "encoding")) {
- s = getQWord(&p);
- if (*s == '\0') /* error */
- continue;
- charset = wc_guess_charset(s, charset);
- }
-#endif
}
label[nitem] = NULL;
diff --git a/rc.c b/rc.c
@@ -4,6 +4,7 @@
*/
#include "fm.h"
#include "myctype.h"
+#include "proto.h"
#include <stdio.h>
#include <errno.h>
#include "parsetag.h"
@@ -1507,7 +1508,7 @@ to_str(struct param_ptr *p)
Buffer *
load_option_panel(void)
{
- Str str;
+ Str src;
struct param_ptr *p;
struct sel_c *s;
#ifdef USE_M17N
@@ -1519,8 +1520,8 @@ load_option_panel(void)
if (optionpanel_str == NULL)
optionpanel_str = Sprintf(optionpanel_src1, w3m_version,
- html_quote(Local_cookie->ptr), CMT_HELPER);
-#ifdef LANG == JA
+ html_quote(localCookie()->ptr), CMT_HELPER);
+#if LANG == JA
if (!OptionEncode) {
optionpanel_str =
wc_Str_conv(optionpanel_str, OptionCharset, InnerCharset);