Move the Win32 #undefs of X509_NAME and PKCS7_ISSUER_AND_SERIAL so they will
[openssl.git] / crypto / x509 / x509.h
index 6f8fac0..de57479 100644 (file)
@@ -86,6 +86,12 @@ extern "C" {
 
 #include <openssl/evp.h>
 
+
+#ifdef WIN32
+/* Under Win32 this is defined in wincrypt.h */
+#undef X509_NAME
+#endif
+
 #define X509_FILETYPE_PEM      1
 #define X509_FILETYPE_ASN1     2
 #define X509_FILETYPE_DEFAULT  3