Avoid clashes with Win32 names in WinCrypt.h

This commit is contained in:
Dr. Stephen Henson 2003-07-23 00:10:43 +00:00
parent 968766cad8
commit f96d1af449
2 changed files with 3 additions and 1 deletions

View File

@ -97,6 +97,7 @@ typedef int ASN1_NULL;
#ifdef OPENSSL_SYS_WIN32
#undef X509_NAME
#undef X509_CERT_PAIR
#undef PKCS7_ISSUER_AND_SERIAL
#endif

View File

@ -112,8 +112,9 @@ extern "C" {
#endif
#ifdef OPENSSL_SYS_WIN32
/* Under Win32 this is defined in wincrypt.h */
/* Under Win32 these are defined in wincrypt.h */
#undef X509_NAME
#undef X509_CERT_PAIR
#endif
#define X509_FILETYPE_PEM 1