[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  be66a15cc1a4c3cc68fa854ceea321ca57f96304 (commit)
      from  99435164ac55fda18922e278316ad76305f338ad (commit)


- Log -----------------------------------------------------------------
commit be66a15cc1a4c3cc68fa854ceea321ca57f96304
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Tue Sep 10 22:47:57 2019 +0000

    Fix unused goto label gcc warning
    
    On systems with undefined AI_ADDRCONFIG and AI_NUMERICHOST:
    
    x86_64-w64-mingw32-gcc  -I. -Icrypto/include -Iinclude -m64 -Wall -O3 -fno-ident ...
    crypto/bio/b_addr.c: In function 'BIO_lookup_ex':
    crypto/bio/b_addr.c:699:7: warning: label 'retry' defined but not used [-Wunused-label]
           retry:
           ^~~~~
    
    Regression from: 3f91ede9aea70774d9b5d509bc76d484ebaff6aa
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/9856)

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

Summary of changes:
 crypto/bio/b_addr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index 40cf89da5b..4652003149 100644
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -697,7 +697,9 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
         /* Note that |res| SHOULD be a 'struct addrinfo **' thanks to
          * macro magic in bio_local.h
          */
+# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
       retry:
+# endif
         switch ((gai_ret = getaddrinfo(host, service, &hints, res))) {
 # ifdef EAI_SYSTEM
         case EAI_SYSTEM: