diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-27 07:48:04 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-27 07:48:04 +0000 |
| commit | c55719227f0a037e9056e64225a8f209774287e4 (patch) | |
| tree | abd2bf52e324194846d7d2316c947a6cfef26740 /ext/openssl | |
| parent | cebf5073dd1526d2a307fba3c5948d4d8ca661d8 (diff) | |
| download | ruby-c55719227f0a037e9056e64225a8f209774287e4.tar.gz ruby-c55719227f0a037e9056e64225a8f209774287e4.tar.xz ruby-c55719227f0a037e9056e64225a8f209774287e4.zip | |
* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
Solaris compiler. [ruby-core:08114]
* time.c (time_to_s): use +0900 style timezone string for local time.
[ruby-dev:29143]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 5ab93bf39..0366901a3 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -18,6 +18,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> + +/* * Check the OpenSSL version * The only supported are: * OpenSSL >= 0.9.7 @@ -61,15 +70,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; |