Author: markt
Date: Mon Feb 6 21:01:09 2017
New Revision: 1781952
URL: http://svn.apache.org/viewvc?rev=1781952&view=rev
Log:
Follow-up to r1781943
Fix build errors on Windows
Confirmed that terminated threads are removed from the hash
Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1781952&r1=1781951&r2=1781952&view=diff
==============================================================================
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Mon Feb 6 21:01:09 2017
@@ -364,7 +364,7 @@ int SSL_callback_alpn_select_pro
void SSL_thread_exit(void);
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) && ! defined(WIN32)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) && ! (defined(WIN32) ||
defined(WIN64))
unsigned long SSL_ERR_get(void);
void SSL_ERR_clear(void);
#else
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1781952&r1=1781951&r2=1781952&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Mon Feb 6 21:01:09 2017
@@ -445,6 +445,7 @@ void SSL_thread_exit(void) {
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if ! (defined(WIN32) || defined(WIN64))
unsigned long SSL_ERR_get() {
apr_threadkey_private_set(thread_exit_key, thread_exit_key);
return ERR_get_error();
@@ -454,6 +455,7 @@ void SSL_ERR_clear() {
apr_threadkey_private_set(thread_exit_key, thread_exit_key);
ERR_clear_error();
}
+#endif
static void _ssl_thread_exit(void *data) {
UNREFERENCED(data);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
