#undef some things that cause a conflict under Win32 when

wincrypt.h is included.

diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h
index b3aa586b18d2f9650ad0e4f2705ab46c2acaa631..6bd42aee4d439e12fef17a78bb7d4f8673b40df3 100644 (file)
--- a/crypto/ossl_typ.h
+++ b/crypto/ossl_typ.h
@@ -93,6 +93,11 @@ typedef int ASN1_BOOLEAN;
 typedef int ASN1_NULL;
 #endif
 
 typedef int ASN1_NULL;
 #endif
 

+#ifdef OPENSSL_SYS_WIN32
+#undef X509_NAME
+#undef PKCS7_ISSUER_AND_SERIAL
+#endif
+

 typedef struct evp_cipher_st EVP_CIPHER;
 typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
 typedef struct env_md_st EVP_MD;
 typedef struct evp_cipher_st EVP_CIPHER;
 typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
 typedef struct env_md_st EVP_MD;