diff options
| -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; |