shyouhei	2011-05-21 07:28:18 +0900 (Sat, 21 May 2011)

  New Revision: 31661

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

  Log:
    merge revision(s) 30479:
    
    * ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
      specified to use winsock2 by user.
      this problem is reported by kosaki.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/socket/getaddrinfo.c
    branches/ruby_1_8_7/ext/socket/getnameinfo.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/socket/getaddrinfo.c
===================================================================
--- ruby_1_8_7/ext/socket/getaddrinfo.c	(revision 31660)
+++ ruby_1_8_7/ext/socket/getaddrinfo.c	(revision 31661)
@@ -71,7 +71,11 @@
 #include <in.h>
 #include <netdb.h>
 #else
+#if USE_WINSOCK2
 #include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
 #include <io.h>
 #endif
 #include <string.h>
Index: ruby_1_8_7/ext/socket/getnameinfo.c
===================================================================
--- ruby_1_8_7/ext/socket/getnameinfo.c	(revision 31660)
+++ ruby_1_8_7/ext/socket/getnameinfo.c	(revision 31661)
@@ -56,7 +56,11 @@
 #endif
 #endif
 #ifdef _WIN32
+#if USE_WINSOCK2
 #include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
 #define snprintf _snprintf
 #endif
 
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31660)
+++ ruby_1_8_7/ChangeLog	(revision 31661)
@@ -1,3 +1,9 @@
+Fri May 20 23:46:44 2011  NAKAMURA Usaku  <usa@r...>
+
+	* ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
+	  specified to use winsock2 by user.
+	  this problem is reported by kosaki.
+
 Fri May 20 23:23:45 2011  NAKAMURA Usaku  <usa@r...>
 
 	* ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 31660)
+++ ruby_1_8_7/version.h	(revision 31661)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2011-05-21"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20110521
-#define RUBY_PATCHLEVEL 337
+#define RUBY_PATCHLEVEL 338
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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