Fix for WIN32 builds with KRB5

(cherry picked from commit 3eddd1706a30cdf3dc9278692d8ee9038eac8a0d)

diff --git a/ssl/kssl.h b/ssl/kssl.h
index 8242fd5eeb650c0ac775e14a1cf7fe7a0ac32836..e4df84307313b9de402e4fde08be9a3f8e99763d 100644 (file)
--- 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" {