From c4962abc9b5940cdd3bed920b19334fd269df31b Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Sat, 18 Oct 2014 19:59:47 -0400
Subject: Update openssl to version openssl-1.0.1j

Conflicts:
	openssl/Makefile
	openssl/crypto/opensslconf.h
---
 openssl/crypto/stack/safestack.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'openssl/crypto/stack')

diff --git a/openssl/crypto/stack/safestack.h b/openssl/crypto/stack/safestack.h
index ea3aa0d80..bc194cb26 100644
--- a/openssl/crypto/stack/safestack.h
+++ b/openssl/crypto/stack/safestack.h
@@ -57,6 +57,10 @@
 
 #include <openssl/stack.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef CHECKED_PTR_OF
 #define CHECKED_PTR_OF(type, p) \
     ((void*) (1 ? p : (type*)0))
@@ -2660,4 +2664,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
 /* End of util/mkstack.pl block, you may now edit :-) */
 
+
+#ifdef  __cplusplus
+}
+#endif
 #endif /* !defined HEADER_SAFESTACK_H */
-- 
cgit v1.2.3