diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-12 12:06:54 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-12 12:06:54 +0000 |
| commit | 82ce1f0a8d656cb94b3a8f0026ba274ca9cf42ff (patch) | |
| tree | 6d14b88f807ef63fb43cbb56cc37a477a4823aec | |
| parent | f9ac9e2dfc31aa0f641746c88a1cdc82d3bd016c (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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -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> |