diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-02 10:03:16 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-02 10:03:16 +0000 |
| commit | d995f01f67ba20828c2ece2614887ff86ce512a9 (patch) | |
| tree | 6e1a7ece9718f5240fb0c37ac39a4d12d4b35cc7 | |
| parent | 5fc8821161833c93256572ac3528af4962e3a045 (diff) | |
* ext/openssl/extconf.rb: use create_header.
* ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
include RUBY_EXTCONF_H.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/openssl_missing.c | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 2 |
4 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Fri Jun 2 19:00:40 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/extconf.rb: use create_header. + + * ext/openssl/ossl.h, ext/openssl/openssl_missing.h: + include RUBY_EXTCONF_H. + Fri Jun 2 17:16:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created. diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 04c86e7505..11f74ff3d8 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -117,5 +117,7 @@ have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h") have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") message "=== Checking done. ===\n" + +create_header create_makefile("openssl") message "Done.\n" diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c index 3b8083c257..f77731ed65 100644 --- a/ext/openssl/openssl_missing.c +++ b/ext/openssl/openssl_missing.c @@ -8,6 +8,8 @@ * This program is licenced under the same licence as Ruby. * (See the file 'LICENCE'.) */ +#include RUBY_EXTCONF_H + #if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE) # include <openssl/engine.h> #endif @@ -17,6 +19,8 @@ #include <string.h> /* memcpy() */ #include <openssl/hmac.h> +#include "openssl_missing.h" + #if !defined(HAVE_HMAC_CTX_COPY) int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in) diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 56b3b2ec18..5ab93bf39e 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -11,6 +11,8 @@ #if !defined(_OSSL_H_) #define _OSSL_H_ +#include RUBY_EXTCONF_H + #if defined(__cplusplus) extern "C" { #endif |