Permalink
Browse files

merge revision(s) 30479:

?\012
	* 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@ruby-lang.org>

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@31661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 8aef8bd commit 62841fad0b883ae2f08ffd6f3f5220c334491ce9 @shyouhei shyouhei committed May 20, 2011
Showing with 15 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +4 −0 ext/socket/getaddrinfo.c
  3. +4 −0 ext/socket/getnameinfo.c
  4. +1 −1 version.h
View
@@ -1,3 +1,9 @@
+Fri May 20 23:46:44 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby
View
@@ -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>
View
@@ -56,7 +56,11 @@
#endif
#endif
#ifdef _WIN32
+#if USE_WINSOCK2
#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
#define snprintf _snprintf
#endif
View
@@ -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

0 comments on commit 62841fa

Please sign in to comment.