[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  44cb4f5b5f0cee7e177aa8fc214b992f016fa8f0 (commit)
      from  e97763c92c655dcf4af2860b3abd2bc4c8a267f9 (commit)


- Log -----------------------------------------------------------------
commit 44cb4f5b5f0cee7e177aa8fc214b992f016fa8f0
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Aug 23 20:49:26 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bio_lcl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h
index 5d0b827..39178cf 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