diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:14:26 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 08:14:26 +0000 |
| commit | 99f7dae16a6205793f78f5ed4bd342e17d9a5ce2 (patch) | |
| tree | 0a809c202295b5407b844338c946c9d1a2b628a1 /ext | |
| parent | 858b8250fe840f08023d3ef965481ed6588fe928 (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_6@17654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 598bfb69da..0c23f10d38 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -42,6 +42,11 @@ extern "C" { #if defined(_WIN32) # define OpenFile WINAPI_OpenFile # define OSSL_NO_CONF_API 1 +# ifdef USE_WINSOCK2 +# include <winsock2.h> +# else +# include <winsock.h> +# endif #endif #include <errno.h> #include <openssl/err.h> |