merge revision(s) 17108:

	* ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
	  a patch from arton <artonx at yahoo.co.jp> in [ruby-dev:35078]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c893fdbbe..c35d8337bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 17:15:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
+	  a patch from arton <artonx at yahoo.co.jp> in [ruby-dev:35078]
+
 Sun Jun 29 17:09:48 2008  wanabe  <s.wanabe@gmail.com>
 
 	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index a4bc661eb1..3cc30ae2e8 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -46,7 +46,11 @@ extern "C" {
 
 #if defined(_WIN32)
 #  define OSSL_NO_CONF_API 1
-#  include <winsock2.h>
+#  ifdef USE_WINSOCK2
+#    include <winsock2.h>
+#  else
+#    include <winsock.h>
+#  endif
 #endif
 #include <errno.h>
 #include <openssl/err.h>
diff --git a/version.h b/version.h
index c7865ef788..4ff22ea8de 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 24
+#define RUBY_PATCHLEVEL 25
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8