shyouhei	2008-06-29 17:14:26 +0900 (Sun, 29 Jun 2008)

  New Revision: 17654

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/openssl/ossl.h
    branches/ruby_1_8_6/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_6/ChangeLog?r1=17654&r2=17653&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17654&r2=17653&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/openssl/ossl.h?r1=17654&r2=17653&diff_format=u