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 /ext | |
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
Diffstat (limited to 'ext')
-rw-r--r-- | ext/openssl/ossl.h | 20 |
1 files changed, 7 insertions, 13 deletions
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; |