From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Sep 2016 18:53:06 +0000 (+0200)
Subject: Remove entirely unnecessary pointer size guards
X-Git-Tag: OpenSSL_1_0_2i~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2d2120033dcee7f9697815cf4a36a3ef8f517bb;p=oweals%2Fopenssl.git

Remove entirely unnecessary pointer size guards

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 1c7429fd85..8b4e1f5ce8 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -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) {
diff --git a/apps/s_server.c b/apps/s_server.c
index a835db0081..f0a94d61e1 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -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) {
+        unsigned long sl = 1;
 
-#    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)