diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-25 11:18:02 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-25 11:18:02 +0000 |
| commit | 05301f88c25d1078b79c21b5d2babad4f2f07c89 (patch) | |
| tree | 5294bab28c965693f3438e4eb74dee055dbe09e7 | |
| parent | 2c862f1bdc0dfb4cf0381432b9fa4cbab4e8b8e9 (diff) | |
revert to p11
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 20 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 22 deletions
@@ -1,8 +1,3 @@ -Thu Dec 21 20:11:31 2006 URABE Shyouhei <shyouhei@ruby-lang.org> - - * ext/openssl/ossl.h: fixed compilation problem on gcc 3.2. - [ruby-talk:214786] - Sat Dec 16 04:02:10 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/tcltklib.c: shouldn't run the killed thread at callback. diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index af27bae6a6..c0325229c1 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -18,10 +18,13 @@ extern "C" { #endif /* - *_FILE_OFFSET_BITS needs to be defined before some system headers on - * Solaris. - */ -#include "config.h" +* 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> /* * Check the OpenSSL version @@ -66,15 +69,6 @@ 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; @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2006-12-21" +#define RUBY_RELEASE_DATE "2006-12-16" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20061221 -#define RUBY_PATCHLEVEL 12 +#define RUBY_RELEASE_CODE 20061216 +#define RUBY_PATCHLEVEL 11 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2006 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 16 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |