[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b57f0c598bde43e147a886c9ffb0d6fdb3141d72 (commit)
      from  74a011ebb5e9028ef18982d737a434a8ff926a95 (commit)


- Log -----------------------------------------------------------------
commit b57f0c598bde43e147a886c9ffb0d6fdb3141d72
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 11 20:34:08 2017 +0200

    Clean away needless VMS check
    
    BIO_socket_ioctl is only implemented on VMS for VMS version 7.0 and
    up, but since we only support version 7.1 and up, there's no need to
    check the VMS version.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3448)

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

Summary of changes:
 crypto/bio/b_sock.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index ac2c2d1..97dcc70 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -167,8 +167,6 @@ void bio_sock_cleanup_int(void)
 # endif
 }
 
-# if !defined(OPENSSL_SYS_VMS) || __VMS_VER >= 70000000
-
 int BIO_socket_ioctl(int fd, long type, void *arg)
 {
     int i;
@@ -206,7 +204,6 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
         SYSerr(SYS_F_IOCTLSOCKET, get_last_socket_error());
     return (i);
 }
-# endif                         /* __VMS_VER */
 
 # if OPENSSL_API_COMPAT < 0x10100000L
 int BIO_get_accept_socket(char *host, int bind_mode)