From 1955b8742354a989650853412c27863f1644e81d Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 2 Feb 2002 13:19:27 +0000 Subject: [PATCH 1/1] #undef some things that cause a conflict under Win32 when wincrypt.h is included. --- crypto/ossl_typ.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h index b3aa586b18..6bd42aee4d 100644 --- a/crypto/ossl_typ.h +++ b/crypto/ossl_typ.h @@ -93,6 +93,11 @@ typedef int ASN1_BOOLEAN; 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; -- 2.34.1