shyouhei	2008-06-29 17:16:02 +0900 (Sun, 29 Jun 2008)

  New Revision: 17656

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/openssl/ossl.h
    branches/ruby_1_8_7/version.h

  Log:
    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]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ext/openssl/ossl.h?r1=17656&r2=17655&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17656&r2=17655&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17656&r2=17655&diff_format=u

Index: ruby_1_8_7/ext/openssl/ossl.h
===================================================================
--- ruby_1_8_7/ext/openssl/ossl.h	(revision 17655)
+++ ruby_1_8_7/ext/openssl/ossl.h	(revision 17656)
@@ -46,7 +46,11 @@
 
 #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>
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17655)
+++ ruby_1_8_7/ChangeLog	(revision 17656)
@@ -1,3 +1,8 @@
+Sun Jun 29 17:15:49 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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@g...>
 
 	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17655)
+++ ruby_1_8_7/version.h	(revision 17656)
@@ -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

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