[w3m-dev 02901] DNS_ORDER_*

* fm.h (DNS_ORDER_*): added
* rc.c (dnsorders): use N_S(DNS_ORDER_*)
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

3 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f067c22..296895e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2002-01-25  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 02901] DNS_ORDER_*
+	* fm.h (DNS_ORDER_*): added
+	* rc.c (dnsorders): use N_S(DNS_ORDER_*)
+
+2002-01-25  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 	
 	* [w3m-dev 02901] ACCEPT_BAD_COOKIE_*
 	* file.c (readHeader): accept_bad_cookie is one of ACCEPT_BAD_COOKIE_*
@@ -2252,4 +2258,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.256 2002/01/24 16:59:16 ukai Exp $
+$Id: ChangeLog,v 1.257 2002/01/24 17:07:40 ukai Exp $
diff --git a/fm.h b/fm.h
index 102ae70..4d71f75 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.42 2002/01/24 16:59:16 ukai Exp $ */
+/* $Id: fm.h,v 1.43 2002/01/24 17:07:40 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -670,7 +670,10 @@ global ParsedURL FTP_proxy_parsed;
 global char *NO_proxy init(NULL);
 global int NOproxy_netaddr init(TRUE);
 #ifdef INET6
-global int DNS_order init(0);
+#define DNS_ORDER_UNSPEC     0
+#define DNS_ORDER_INET_INET6 1
+#define DNS_ORDER_INET6_INET 2
+global int DNS_order init(DNS_ORDER_UNSPEC);
 extern int ai_family_order_table[3][3];	/* XXX */
 #endif				/* INET6 */
 global TextList *NO_proxy_domains;
diff --git a/rc.c b/rc.c
index 9693df8..78a36eb 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.33 2002/01/24 16:59:16 ukai Exp $ */
+/* $Id: rc.c,v 1.34 2002/01/24 17:07:40 ukai Exp $ */
 /* 
  * Initialization file etc.
  */
@@ -371,9 +371,9 @@ static char n_s[][2] = {
 
 #ifdef INET6
 static struct sel_c dnsorders[] = {
-    {0, "0", "unspec"},
-    {1, "1", "inet inet6"},
-    {2, "2", "inet6 inet"},
+    {N_S(DNS_ORDER_UNSPEC), "unspec"},
+    {N_S(DNS_ORDER_INET_INET6), "inet inet6"},
+    {N_S(DNS_ORDER_INET6_INET), "inet6 inet"},
     {0, NULL, NULL}
 };
 #endif				/* INET6 */