diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-26 03:59:39 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-26 03:59:39 +0000 |
| commit | 393197aa7f5d8d9c7afad804aa36be8c6b76d27d (patch) | |
| tree | 268d1d9376eac0ddece83a5e2c9f8cc92f9dbd1b | |
| parent | fad950b3c2dad75f51e878c18c054d63552182cc (diff) | |
* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
<openssl/x509_vfy.h> to avoid compilation error of mswin32.
suggested by NAKAMURA Usaku.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/openssl_missing.c | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Jul 26 12:57:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/openssl_missin.c: include <openssl/engine.h> before + <openssl/x509_vfy.h> to avoid compilation error of mswin32. + suggested by NAKAMURA Usaku. + Mon Jul 25 21:30:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c index dd4e942cbb..3b8083c257 100644 --- a/ext/openssl/openssl_missing.c +++ b/ext/openssl/openssl_missing.c @@ -8,6 +8,10 @@ * This program is licenced under the same licence as Ruby. * (See the file 'LICENCE'.) */ +#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE) +# include <openssl/engine.h> +#endif +#include <openssl/x509_vfy.h> #if !defined(OPENSSL_NO_HMAC) #include <string.h> /* memcpy() */ @@ -30,7 +34,6 @@ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in) #endif /* NO_HMAC */ #if !defined(HAVE_X509_STORE_SET_EX_DATA) -#include <openssl/x509_vfy.h> int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data) { @@ -106,9 +109,6 @@ HMAC_CTX_cleanup(HMAC_CTX *ctx) #endif #if !defined(HAVE_EVP_CIPHER_CTX_COPY) -#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE) -#include <openssl/engine.h> -#endif /* * this function does not exist in OpenSSL yet... or ever?. * a future version may break this function. |