generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid clashes with Win32 names in WinCrypt.h

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/ossl_typ.h
View File

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

3
crypto/x509/x509.h
View File

@ -112,8 +112,9 @@ extern "C" {
#endif #endif
#ifdef OPENSSL_SYS_WIN32 #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_NAME
#undef X509_CERT_PAIR
#endif #endif
#define X509_FILETYPE_PEM 1 #define X509_FILETYPE_PEM 1