yugui	2009-01-16 00:36:29 +0900 (Fri, 16 Jan 2009)

  New Revision: 21543

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21543

  Log:
    merges r21476 from trunk into ruby_1_9_1.
    * ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
      getnameinfo() and getaddrinfo() because Windows doesn't have it.
      see [ruby-dev:37757].
    * ext/socket/sockport.h (SA_LEN): use sockaddr_in6 when defined AF_INET6
      if INET6 is not defined.  winsock2's getaddrinfo() returns
      sockaddr_in6 if ipv6 is available.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/socket/extconf.rb
    branches/ruby_1_9_1/ext/socket/sockport.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21542)
+++ ruby_1_9_1/ChangeLog	(revision 21543)
@@ -1,3 +1,13 @@
+Tue Jan 13 02:54:54 2009  NAKAMURA Usaku  <usa@r...>
+
+	* ext/socket/extconf.rb: use headers instead of "netdb.h" in checking
+	  getnameinfo() and getaddrinfo() because Windows doesn't have it.
+	  see [ruby-dev:37757].
+
+	* ext/socket/sockport.h (SA_LEN): use sockaddr_in6 when defined AF_INET6
+	  if INET6 is not defined.  winsock2's getaddrinfo() returns
+	  sockaddr_in6 if ipv6 is available.
+
 Wed Jan 14 13:19:21 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (rb_w32_aspawn): should not escape with carret
@@ -16,7 +26,7 @@
 
 Tue Jan 13 02:07:38 2009  Hidetoshi NAGAI  <nagai@a...>
 
-	* ext/tk/lib/tk.rb: use Encoding.find("locale") instaed of
+	* ext/tk/lib/tk.rb: use Encoding.find("locale") instead of
 	  Encoding.locale_charmap
 
 Tue Jan 13 00:57:56 2009  Tanaka Akira  <akr@f...>
Index: ruby_1_9_1/ext/socket/extconf.rb
===================================================================
--- ruby_1_9_1/ext/socket/extconf.rb	(revision 21542)
+++ ruby_1_9_1/ext/socket/extconf.rb	(revision 21543)
@@ -244,7 +244,7 @@
 
 $objs = ["socket.#{$OBJEXT}"]
 
-unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("getaddrinfo", "netdb.h")
+unless getaddr_info_ok and have_func("getnameinfo", headers) and have_func("getaddrinfo", headers)
   if have_struct_member("struct in6_addr", "s6_addr8", headers)
     $defs[-1] = "-DHAVE_ADDR8"
   end
Index: ruby_1_9_1/ext/socket/sockport.h
===================================================================
--- ruby_1_9_1/ext/socket/sockport.h	(revision 21542)
+++ ruby_1_9_1/ext/socket/sockport.h	(revision 21543)
@@ -14,7 +14,7 @@
 # ifdef HAVE_SA_LEN
 #  define SA_LEN(sa) (sa)->sa_len
 # else
-#  ifdef INET6
+#  ifdef AF_INET6
 #   define SA_LEN(sa) \
 	(((sa)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
 				       : sizeof(struct sockaddr))

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/