Fix for WIN32 builds with KRB5
authorDr. Stephen Henson <steve@openssl.org>
Wed, 26 Feb 2014 15:28:20 +0000 (15:28 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 26 Feb 2014 15:33:11 +0000 (15:33 +0000)
(cherry picked from commit 3eddd1706a30cdf3dc9278692d8ee9038eac8a0d)

ssl/kssl.h

index 8242fd5..e4df843 100644 (file)
 #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" {