From 09e5e42d3e9b8d8f0e065ac051d7fc0d4d4d8d10 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 26 Jul 2005 03:59:39 +0000
Subject: [PATCH] * 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/trunk@8837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                     | 6 ++++++
 ext/openssl/openssl_missing.c | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 888773b35d..38fe17ff7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 26 12:57:40 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 23:48:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.[ch]: (rb_w32_vsnprintf, rb_w32_snprintf): removed.
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.