usa	2008-06-12 21:06:54 +0900 (Thu, 12 Jun 2008)

  New Revision: 17108

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/openssl/ossl.h

  Log:
    * 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/ChangeLog?r1=17108&r2=17107&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/openssl/ossl.h?r1=17108&r2=17107&diff_format=u

Index: ruby_1_8/ext/openssl/ossl.h
===================================================================
--- ruby_1_8/ext/openssl/ossl.h	(revision 17107)
+++ ruby_1_8/ext/openssl/ossl.h	(revision 17108)
@@ -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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17107)
+++ ruby_1_8/ChangeLog	(revision 17108)
@@ -1,3 +1,8 @@
+Thu Jun 12 21:05:44 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]
+
 Thu Jun 12 03:20:59 2008  Yusuke Endoh  <mame@t...>
 
 	* ext/stringio/stringio.c (strio_init): rewind when reopened.

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