From 242d48135a12fc9167430f391ba0d27d9ad44c6b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 14 Apr 2014 23:15:59 +0200
Subject: Updated openssl to version 1.0.1g

---
 openssl/ssl/kssl.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'openssl/ssl/kssl.h')

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" {
-- 
cgit v1.2.3