summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-02 10:03:16 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-02 10:03:16 +0000
commit13d16b8de4a11476d417a91a227df32bd406ea54 (patch)
treed8f40c69dd08d612d72826c3813ee2e43cef59ca
parente4b7715d0aed3852b46f1042cb967cedfd45dc03 (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/branches/ruby_1_8@10209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/openssl/extconf.rb2
-rw-r--r--ext/openssl/openssl_missing.c4
-rw-r--r--ext/openssl/ossl.h2
4 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c128a01..1fc2c98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 2 19:02:09 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 42afc96..6cee5b0 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -116,5 +116,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 3b8083c..f77731e 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 f3c5a52..73e7246 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