diff options
| author | Robin Lee <robinlee.sysu@gmail.com> | 2014-09-04 12:36:41 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2014-09-08 11:06:07 -0400 |
| commit | 240635c0b275da3d3f8adf4aa94b428ee33530b8 (patch) | |
| tree | d3f89e07c3b51df431373c53c3680758c52ce29e /crypto/x509v3 | |
| parent | 610ac0525dc00eae988315530e0c30e22cef6c5d (diff) | |
RT3031: Need to #undef some names for win32
Copy the ifdef/undef stanza from x509.h to x509v3.h
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit 83e4e03eeb22d2fbaec516a466330f2ccab22864)
Diffstat (limited to 'crypto/x509v3')
| -rw-r--r-- | crypto/x509v3/x509v3.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 051b250abf..6556366277 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -66,6 +66,13 @@ extern "C" { #endif +#ifdef OPENSSL_SYS_WIN32 +/* Under Win32 these are defined in wincrypt.h */ +#undef X509_NAME +#undef X509_CERT_PAIR +#undef X509_EXTENSIONS +#endif + /* Forward reference */ struct v3_ext_method; struct v3_ext_ctx; |