Commit f96d1af4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Avoid clashes with Win32 names in WinCrypt.h

parent 968766ca

crypto/ossl_typ.h

+1 −0
Original line number Diff line number Diff line
@@ -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

crypto/x509/x509.h

+2 −1
Original line number Diff line number Diff line
@@ -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