diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:30 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:30 +0000 |
| commit | a0948d8334936d086e6af4157674f90dedf35296 (patch) | |
| tree | 8fcd1b92ec8d2469bf63d8c2d88b55b8677ef1fd /ext | |
| parent | 5f1eb218452a510cec93e05b6dbeb3307936f50d (diff) | |
merges r32288 and r32292 from trunk into ruby_1_9_2.
--
* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
--
* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): define only if not defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 4bb18d5020..1a5b263124 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -46,6 +46,9 @@ extern "C" { #if defined(_WIN32) # define OSSL_NO_CONF_API 1 +# if !defined(OPENSSL_SYS_WIN32) +# define OPENSSL_SYS_WIN32 1 +# endif # include <winsock2.h> #endif #include <errno.h> |