Fixes so it will compile again under Win32.

[openssl.git] / crypto / x509 / x509_vfy.h

diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index fd70b74961deede8e80738efadcf021b775b11f8..6ce521a9980f4ac6c63fc74ee09f19352bcde4e2 100644 (file)
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -56,6 +56,12 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef HEADER_X509_H
+#include <openssl/x509.h>
+/* openssl/x509.h ends up #include-ing this file at about the only
+ * appropriate moment. */
+#endif
+
 #ifndef HEADER_X509_VFY_H
 #define HEADER_X509_VFY_H
 
@@ -63,8 +69,8 @@
 extern "C" {
 #endif
 
-#include "bio.h"
-#include "crypto.h"
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
 
 /* Outer object */
 typedef struct x509_hash_dir_st
@@ -216,11 +222,9 @@ struct x509_store_state_st
 #define X509_L_FILE_LOAD       1
 #define X509_L_ADD_DIR         2
 
-X509_LOOKUP_METHOD *X509_LOOKUP_file();
 #define X509_LOOKUP_load_file(x,name,type) \
                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
 
-X509_LOOKUP_METHOD *X509_LOOKUP_dir();
 #define X509_LOOKUP_add_dir(x,name,type) \
                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)