diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Jun 29 17:10:30 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] + Sun Jun 29 17:07:30 2008 wanabe <s.wanabe@gmail.com> * util.c (ruby_strtod): ruby_strtod don't allow a trailing 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> @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 241 +#define RUBY_PATCHLEVEL 242 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |