diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-04-23 12:31:35 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-04-23 12:31:35 +0200 |
| commit | 0c5af0c28f23f75f93e253aeccb00c5ad20c116e (patch) | |
| tree | fae9826018c36f1011007d029b728c290c50485c /main/openssl/ssl/kssl.h | |
| parent | c69ba1780496c260a1b4498596bae428e0df232d (diff) | |
Update OpenSSL to 1.0.1g
Diffstat (limited to 'main/openssl/ssl/kssl.h')
| -rw-r--r-- | main/openssl/ssl/kssl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/main/openssl/ssl/kssl.h b/main/openssl/ssl/kssl.h index 8242fd5e..e4df8430 100644 --- a/main/openssl/ssl/kssl.h +++ b/main/openssl/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" { |