diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:15:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:15:59 +0200 |
| commit | 242d48135a12fc9167430f391ba0d27d9ad44c6b (patch) | |
| tree | 95c65b0c4b195842adfd8dcf4c10c8f46b24e044 /openssl/ssl/kssl.h | |
| parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
| download | vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.tar.gz vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.tar.bz2 vcxsrv-242d48135a12fc9167430f391ba0d27d9ad44c6b.zip | |
Updated openssl to version 1.0.1g
Diffstat (limited to 'openssl/ssl/kssl.h')
| -rw-r--r-- | openssl/ssl/kssl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/openssl/ssl/kssl.h b/openssl/ssl/kssl.h index 8242fd5ee..e4df84307 100644 --- a/openssl/ssl/kssl.h +++ b/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" { |