yugui	2011-07-03 21:24:30 +0900 (Sun, 03 Jul 2011)

  New Revision: 32387

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

  Log:
    * ext/socket/extconf.rb (have_type("PADDRINFO")): new check.
    
    * ext/socket/addrinfo.h: fixed a compilation problem with VC++ 2010.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/socket/addrinfo.h
    branches/ruby_1_9_2/ext/socket/extconf.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32386)
+++ ruby_1_9_2/ChangeLog	(revision 32387)
@@ -1,3 +1,9 @@
+Sun Jul  3 21:02:05 2011  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* ext/socket/extconf.rb (have_type("PADDRINFO")): new check.
+
+	* ext/socket/addrinfo.h: fixed a compilation problem with VC++ 2010.
+
 Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@r...>
 
 	* ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
Index: ruby_1_9_2/ext/socket/extconf.rb
===================================================================
--- ruby_1_9_2/ext/socket/extconf.rb	(revision 32386)
+++ ruby_1_9_2/ext/socket/extconf.rb	(revision 32387)
@@ -122,6 +122,8 @@
   have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
 end
 
+have_type("PADDRINFO", %w[ ws2tcpip.h wspiapi.h ])
+
 getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
   (checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
 #{cpp_include(headers)}
Index: ruby_1_9_2/ext/socket/addrinfo.h
===================================================================
--- ruby_1_9_2/ext/socket/addrinfo.h	(revision 32386)
+++ ruby_1_9_2/ext/socket/addrinfo.h	(revision 32387)
@@ -172,7 +172,9 @@
 	int flags));
 
 extern void freehostent __P((struct hostent *));
+#ifndef HAVE_PADDRINFO
 extern void freeaddrinfo __P((struct addrinfo *));
+#endif
 extern
 #ifdef GAI_STRERROR_CONST
 const
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32386)
+++ ruby_1_9_2/version.h	(revision 32387)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 286
+#define RUBY_PATCHLEVEL 287
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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