Commit a2d21200 authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove entirely unnecessary pointer size guards 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 45852545

apps/s_client.c

+0 −12
Original line number Diff line number Diff line
@@ -1464,19 +1464,7 @@ int MAIN(int argc, char **argv) 


#ifdef FIONBIO

    if (c_nbio) {

#if defined(OPENSSL_SYS_VMS) && defined(__VMS_VER) && (__VMS_VER >= 70000000)  

        /* For 64-bit --> 32-bit restricted APIs (IOCTL) */

#if __INITIAL_POINTER_SIZE == 64 

#pragma __required_pointer_size __save 

#pragma __required_pointer_size 32 

#endif 

        unsigned int l = 1;

#if __INITIAL_POINTER_SIZE == 64 

#pragma __required_pointer_size __restore 

#endif 

#else  

        unsigned long l = 1;

#endif /* OPENSSL_SYS_VMS */



        BIO_printf(bio_c_out, "turning on non blocking io\n");

        if (BIO_socket_ioctl(s, FIONBIO, &l) < 0) {

apps/s_server.c

+1 −25
Original line number Diff line number Diff line
@@ -2203,19 +2203,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context) 
    }

#ifdef FIONBIO

    if (s_nbio) {

#    if defined(OPENSSL_SYS_VMS) && defined(__VMS_VER) && (__VMS_VER >= 70000000) 	 	 

        /* For 64-bit --> 32-bit restricted APIs (IOCTL) */ 	 	 

#       if __INITIAL_POINTER_SIZE == 64 	 	 

#           pragma __required_pointer_size __save 	  	 

#           pragma __required_pointer_size 32 	  	 

#   endif 	  	 

        unsigned int sl =1; 

#       if __INITIAL_POINTER_SIZE == 64 	 	 

#           pragma __required_pointer_size __restore 	  	 

#       endif 	  	 

#    else 	  	 

        unsigned long sl = 1;

#    endif /* OPENSSL_SYS_VMS */



        if (!s_quiet)

            BIO_printf(bio_err, "turning on non blocking io\n");
@@ -2850,20 +2838,8 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) 


#ifdef FIONBIO

    if (s_nbio) {



#    if defined(OPENSSL_SYS_VMS) && defined(__VMS_VER) && (__VMS_VER >= 70000000) 	 	 

        /* For 64-bit --> 32-bit restricted APIs (IOCTL) */ 	 	 

#       if __INITIAL_POINTER_SIZE == 64 	 	 

#           pragma __required_pointer_size __save 	  	 

#           pragma __required_pointer_size 32 	  	 

#   endif 	  	 

        unsigned int sl ;

#       if __INITIAL_POINTER_SIZE == 64 	 	 

#           pragma __required_pointer_size __restore 	  	 

#       endif 	  	 

#    else 	  	 

        unsigned long sl = 1;

#    endif /* OPENSSL_SYS_VMS */



        if (!s_quiet)

            BIO_printf(bio_err, "turning on non blocking io\n");

        if (BIO_socket_ioctl(s, FIONBIO, &sl) < 0)