diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:16:02 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:16:02 +0000 |
| commit | 9ba0dcb904addc2cec449ceab24ccf5f9f9dcb35 (patch) | |
| tree | a770c42926c5e5508417355b6ad14489283ecce2 /ext | |
| parent | 2cd51a22a205dc24c324ae1c6c31b7e241ca2bc7 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl.h | 6 |
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> |