aboutsummaryrefslogtreecommitdiffstats
path: root/rc.c
diff options
context:
space:
mode:
authorDai Sato <satodai@w3m.jp>2006-04-07 13:21:11 +0000
committerDai Sato <satodai@w3m.jp>2006-04-07 13:21:11 +0000
commit22d66ca5850bf0190aa48d7f4442484f01fc7d02 (patch)
tree5b96b7e5bd65f08ad23867bc0738a0fef56f35df /rc.c
parentapply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006. (diff)
downloadw3m-22d66ca5850bf0190aa48d7f4442484f01fc7d02.tar.gz
w3m-22d66ca5850bf0190aa48d7f4442484f01fc7d02.zip
rewind to 10 Feb 2006.
Diffstat (limited to 'rc.c')
-rw-r--r--rc.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/rc.c b/rc.c
index 9a22337..2357c96 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.100 2006/04/05 14:18:54 inu Exp $ */
+/* $Id: rc.c,v 1.101 2006/04/07 13:21:12 inu Exp $ */
/*
* Initialization file etc.
*/
@@ -192,7 +192,6 @@ static int OptionEncode = FALSE;
#endif /* USE_SSL */
#ifdef USE_COOKIE
#define CMT_USECOOKIE N_("Enable cookie processing")
-#define CMT_SHOWCOOKIE N_("Print a message when receiving a cookie")
#define CMT_ACCEPTCOOKIE N_("Accept cookies")
#define CMT_ACCEPTBADCOOKIE N_("Action to be taken on invalid cookie")
#define CMT_COOKIE_REJECT_DOMAINS N_("Domains to reject cookies from")
@@ -302,7 +301,9 @@ static struct sel_c dnsorders[] = {
#ifdef USE_COOKIE
static struct sel_c badcookiestr[] = {
{N_S(ACCEPT_BAD_COOKIE_DISCARD), N_("discard")},
+#if 0
{N_S(ACCEPT_BAD_COOKIE_ACCEPT), N_("accept")},
+#endif
{N_S(ACCEPT_BAD_COOKIE_ASK), N_("ask")},
{0, NULL, NULL}
};
@@ -551,8 +552,6 @@ struct param_ptr params7[] = {
#ifdef USE_COOKIE
struct param_ptr params8[] = {
{"use_cookie", P_INT, PI_ONOFF, (void *)&use_cookie, CMT_USECOOKIE, NULL},
- {"show_cookie", P_INT, PI_ONOFF, (void *)&show_cookie,
- CMT_SHOWCOOKIE, NULL},
{"accept_cookie", P_INT, PI_ONOFF, (void *)&accept_cookie,
CMT_ACCEPTCOOKIE, NULL},
{"accept_bad_cookie", P_INT, PI_SEL_C, (void *)&accept_bad_cookie,
@@ -1112,11 +1111,7 @@ do_mkdir(const char *dir, long mode)
return mkdir(abs, mode);
}
#else /* not __EMX__ */
-#ifdef __MINGW32_VERSION
-#define do_mkdir(dir,mode) mkdir(dir)
-#else
#define do_mkdir(dir,mode) mkdir(dir,mode)
-#endif /* not __MINW32_VERSION */
#endif /* not __EMX__ */
void