diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 20 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 19 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Mon Dec 25 20:08:28 2006 URABE Shyouhei <shyouhei@ruby-lang.org> + + * ext/openssl/ossl.h: fixed compilation problem on gcc 3.2. + [ruby-talk:214786] + Mon Dec 25 10:40:40 2006 URABE Shyouhei <shyouhei@ruby-lang.org> * stable version 1.8.5-p12 released. diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index c0325229c1..af27bae6a6 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -18,13 +18,10 @@ extern "C" { #endif /* -* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it! -*/ -#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/ -# undef RFILE -#endif -#include <ruby.h> -#include <rubyio.h> + *_FILE_OFFSET_BITS needs to be defined before some system headers on + * Solaris. + */ +#include "config.h" /* * Check the OpenSSL version @@ -69,6 +66,15 @@ extern "C" { #endif /* + * OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it! + */ +#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/ +# undef RFILE +#endif +#include <ruby.h> +#include <rubyio.h> + +/* * Common Module */ extern VALUE mOSSL; @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2006-12-25" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20061225 -#define RUBY_PATCHLEVEL 12 +#define RUBY_PATCHLEVEL 13 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |