diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-02-26 15:28:20 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-02-26 15:33:09 +0000 |
| commit | 32171e4e07e05a8309c93b6385f25c32e3a20d3b (patch) | |
| tree | d0c5f6a550291f3c8956aad154415dcee39e8558 | |
| parent | 48e6edabed592301a8ab90845ce17b214879befe (diff) | |
| download | openssl-new-32171e4e07e05a8309c93b6385f25c32e3a20d3b.tar.gz | |
Fix for WIN32 builds with KRB5
(cherry picked from commit 3eddd1706a30cdf3dc9278692d8ee9038eac8a0d)
| -rw-r--r-- | ssl/kssl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ssl/kssl.h b/ssl/kssl.h index 8242fd5eeb..e4df843073 100644 --- a/ssl/kssl.h +++ b/ssl/kssl.h @@ -70,6 +70,15 @@ #include <stdio.h> #include <ctype.h> #include <krb5.h> +#ifdef OPENSSL_SYS_WIN32 +/* These can sometimes get redefined indirectly by krb5 header files + * after they get undefed in ossl_typ.h + */ +#undef X509_NAME +#undef X509_EXTENSIONS +#undef OCSP_REQUEST +#undef OCSP_RESPONSE +#endif #ifdef __cplusplus extern "C" { |