Fix for WIN32 builds with KRB5

(cherry picked from commit 3eddd1706a30cdf3dc9278692d8ee9038eac8a0d)

diff --git a/ssl/kssl.h b/ssl/kssl.h
index a3d20e1ccbdc303f5a7522f6ef2e2f8d9d2930d8..600b259a3127a2be2d005cc949ae321a5db61c1d 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" {