X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fossl_typ.h;h=6bd42aee4d439e12fef17a78bb7d4f8673b40df3;hp=b3aa586b18d2f9650ad0e4f2705ab46c2acaa631;hb=532203cdb0c9c0fc93c39baa973986094cdd7261;hpb=2aa9043ad33776323393f82c8a542d46bdedc34d

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;