From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 26 Feb 2014 15:28:20 +0000 (+0000)
Subject: Fix for WIN32 builds with KRB5
X-Git-Tag: master-post-reformat~922
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=031ea2d14a782c74ab7e1f90afb97df95c89ea8b;p=oweals%2Fopenssl.git

Fix for WIN32 builds with KRB5
(cherry picked from commit 3eddd1706a30cdf3dc9278692d8ee9038eac8a0d)
---

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" {