From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 1 Aug 2012 14:07:04 +0000 (+0000)
Subject: compile without warnings unthreaded.
X-Git-Tag: release-1.4.19rc1~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca7ded0457b7ad8b3faafc6b8f73ff22251685ea;p=thirdparty%2Funbound.git

compile without warnings unthreaded.


git-svn-id: file:///svn/unbound/trunk@2737 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/util/net_help.c b/util/net_help.c
index 72065d034..d24d77c8a 100644
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -726,7 +726,7 @@ void* outgoing_ssl_fd(void* sslctx, int fd)
 #endif
 }
 
-#ifdef OPENSSL_THREADS
+#if defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)
 /** global lock list for openssl locks */
 static lock_basic_t *ub_openssl_locks = NULL;
 
@@ -751,7 +751,7 @@ ub_crypto_lock_cb(int mode, int type, const char *ATTR_UNUSED(file),
 
 int ub_openssl_lock_init(void)
 {
-#ifdef OPENSSL_THREADS
+#if defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)
 	int i;
 	ub_openssl_locks = (lock_basic_t*)malloc(
 		sizeof(lock_basic_t)*CRYPTO_num_locks());
@@ -768,7 +768,7 @@ int ub_openssl_lock_init(void)
 
 void ub_openssl_lock_delete(void)
 {
-#ifdef OPENSSL_THREADS
+#if defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED)
 	int i;
 	if(!ub_openssl_locks)
 		return;