#undef some things that cause a conflict under Win32 when
authorDr. Stephen Henson <steve@openssl.org>
Sat, 2 Feb 2002 13:19:27 +0000 (13:19 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 2 Feb 2002 13:19:27 +0000 (13:19 +0000)
wincrypt.h is included.

crypto/ossl_typ.h

index b3aa586..6bd42ae 100644 (file)
@@ -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;