From: Matt Caswell <matt@openssl.org>
Date: Tue, 23 Aug 2016 19:49:26 +0000 (+0100)
Subject: Fix no-sock
X-Git-Tag: OpenSSL_1_1_0~53
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=44cb4f5b5f0cee7e177aa8fc214b992f016fa8f0;ds=inline

Fix no-sock

The declaration of bio_type_lock is independent of no-sock so should not be
inside OPENSSL_NO_SOCK guards.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h
index 5d0b827930..39178cf50a 100644
--- a/crypto/bio/bio_lcl.h
+++ b/crypto/bio/bio_lcl.h
@@ -137,7 +137,6 @@ typedef unsigned int socklen_t;
 # endif
 
 extern CRYPTO_RWLOCK *bio_lookup_lock;
-extern CRYPTO_RWLOCK *bio_type_lock;
 
 int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa);
 const struct sockaddr *BIO_ADDR_sockaddr(const BIO_ADDR *ap);
@@ -147,6 +146,8 @@ socklen_t BIO_ADDRINFO_sockaddr_size(const BIO_ADDRINFO *bai);
 const struct sockaddr *BIO_ADDRINFO_sockaddr(const BIO_ADDRINFO *bai);
 #endif
 
+extern CRYPTO_RWLOCK *bio_type_lock;
+
 void bio_sock_cleanup_int(void);
 
 #if BIO_FLAGS_UPLINK==0