summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-27 08:20:55 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-27 08:20:55 (GMT)
commit0a34a0a1d412366e3a609ca6e0778dab48ef8720 (patch)
tree1468c0d80ed4807ceff63492b22e4659f0d2cdf3
parent035457f61309e658330ca0613937083f01b6e938 (diff)
merge revision(s) 16855:
* win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--version.h2
-rw-r--r--win32/win32.h1
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c364d6d..efca011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 27 17:20:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
+
Fri Jun 27 15:57:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
diff --git a/version.h b/version.h
index 86245a3..654857c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-27"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080627
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.h b/win32/win32.h
index 87f4d48..d3cd0ee 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -27,6 +27,7 @@
#endif
#ifdef USE_WINSOCK2
#include <winsock2.h>
+#include <ws2tcpip.h>
#include <windows.h>
#else
#include <windows.h>