diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-27 07:46:13 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-27 07:46:13 +0000 |
| commit | 5958a6f8e1fb2f42e1050fc1b7aafcbee2d053c1 (patch) | |
| tree | e2cad6d602015610781ea47fc82cc97ac0fff2c8 | |
| parent | fda57dc9e0ed1bece019873529872bc99004108e (diff) | |
* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
Solaris compiler. [ruby-core:08114]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 18 |
2 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Thu Jul 27 16:41:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up + Solaris compiler. [ruby-core:08114] + Wed Jul 26 22:20:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * configure.in: add support for as and ASFLAGS. [ruby-dev:29138] diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 73e7246c46..c0325229c1 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 @@ -60,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; |