summaryrefslogtreecommitdiffstats
path: root/ext/openssl/openssl_missing.c
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-26 03:59:39 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-26 03:59:39 +0000
commitb6ee0162eeea0eef7de233a5d8836fac59592f3f (patch)
treea1437dbfdbf46d487a732055d253c5b021b88f3e /ext/openssl/openssl_missing.c
parentc5b224b98f5f03615db0dc2ce5d0b5d27d02c506 (diff)
downloadruby-b6ee0162eeea0eef7de233a5d8836fac59592f3f.tar.gz
ruby-b6ee0162eeea0eef7de233a5d8836fac59592f3f.tar.xz
ruby-b6ee0162eeea0eef7de233a5d8836fac59592f3f.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@8837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/openssl_missing.c')
-rw-r--r--ext/openssl/openssl_missing.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index dd4e942cb..3b8083c25 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.