From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 2 Feb 2002 13:19:27 +0000 (+0000)
Subject: #undef some things that cause a conflict under Win32 when
X-Git-Tag: OpenSSL-engine-0_9_6c^2^2~43
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1955b8742354a989650853412c27863f1644e81d;p=oweals%2Fopenssl.git

#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 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;