summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-12 12:06:54 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-12 12:06:54 +0000
commit82ce1f0a8d656cb94b3a8f0026ba274ca9cf42ff (patch)
tree6d14b88f807ef63fb43cbb56cc37a477a4823aec /ext/openssl
parentf9ac9e2dfc31aa0f641746c88a1cdc82d3bd016c (diff)
* 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
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/ossl.h6
1 files changed, 5 insertions, 1 deletions
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>