[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a5a0f328af8c72b1edfc5e59be1c2de9d8b2b358 (commit)
      from  4b9e91b02bee0dd114260513cb6a3f28261124b7 (commit)


- Log -----------------------------------------------------------------
commit a5a0f328af8c72b1edfc5e59be1c2de9d8b2b358
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Jan 7 15:58:52 2018 -0500

    Fix IPv6 define
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5030)

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

Summary of changes:
 include/internal/sockets.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 3758b92..4e914a2 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -120,7 +120,11 @@ struct servent *PASCAL getservbyname(const char *, const char *);
  * bad versions.
  */
 # if !defined(OPENSSL_USE_IPV6)
-#  define OPENSSL_USE_IPV6 1
+#  if defined(AF_INET6)
+#   define OPENSSL_USE_IPV6 1
+#  else
+#   define OPENSSL_USE_IPV6 0
+#  endif
 # endif
 
 # define get_last_socket_error() errno