From 82ce1f0a8d656cb94b3a8f0026ba274ca9cf42ff Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 12 Jun 2008 12:06:54 +0000
Subject: 	* 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@17108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 ext/openssl/ossl.h | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5500f4ab0b..6a97a1d4e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 12 21:05:44 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]
+
 Thu Jun 12 03:20:59 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* ext/stringio/stringio.c (strio_init): rewind when reopened.
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>
-- 
cgit v1.2.3