VMS support bug fixes.

7 files changed, 17 insertions, 15 deletions

diff --git a/apps/s_client.c b/apps/s_client.c
index 594ee7ea16..cea00788a6 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -79,8 +79,8 @@ typedef unsigned int u_int;
 #include <openssl/pem.h>
 #include "s_apps.h"
 
-#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,
-			      and that isn't in VMS < 7.0 */
+#if (defined(VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
@@ -468,7 +468,7 @@ re_start:
 /*			printf("mode tty(%d %d%d) ssl(%d%d)\n",
 				tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
 
-			/* Note: under VMS with SOCKETSHR the third parameter
+			/* Note: under VMS with SOCKETSHR the second parameter
 			 * is currently of type (int *) whereas under other
 			 * systems it is (void *) if you don't have a cast it
 			 * will choke the compiler: if you do have a cast then
diff --git a/apps/s_server.c b/apps/s_server.c
index 5004b6fc0e..42ca408ce3 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -83,8 +83,8 @@ typedef unsigned int u_int;
 #include <openssl/ssl.h>
 #include "s_apps.h"
 
-#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,
-			      and that isn't in VMS < 7.0 */
+#if (defined(VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
@@ -628,7 +628,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 		FD_SET(fileno(stdin),&readfds);
 #endif
 		FD_SET(s,&readfds);
-		/* Note: under VMS with SOCKETSHR the third parameter is
+		/* Note: under VMS with SOCKETSHR the second parameter is
 		 * currently of type (int *) whereas under other systems
 		 * it is (void *) if you don't have a cast it will choke
 		 * the compiler: if you do have a cast then you can either
diff --git a/apps/s_socket.c b/apps/s_socket.c
index 1d8587f1f5..99a94633aa 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -78,12 +78,12 @@ typedef unsigned int u_int;
 #include "s_apps.h"
 #include <openssl/ssl.h>
 
+#ifdef VMS
 #if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,
 			      and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
-#ifdef VMS /* for vfork() */
-#include <processes.h>
+#include <processes.h> /* for vfork() */
 #endif
 
 static struct hostent *GetHostByName(char *name);
@@ -255,7 +255,9 @@ int nbio_init_client_ip(int *sock, unsigned char ip[4], int port)
 
 	if (*sock <= 0)
 		{
+#ifdef FIONBIO
 		unsigned long l=1;
+#endif
 
 		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
 		if (s == INVALID_SOCKET) { perror("socket"); return(0); }
@@ -387,7 +389,7 @@ redoit:
 
 	memset((char *)&from,0,sizeof(from));
 	len=sizeof(from);
-	/* Note: under VMS with SOCKETSHR the third parameter is currently
+	/* Note: under VMS with SOCKETSHR the fourth parameter is currently
 	 * of type (int *) whereas under other systems it is (void *) if
 	 * you don't have a cast it will choke the compiler: if you do
 	 * have a cast then you can either go for (int *) or (void *).
diff --git a/apps/s_time.c b/apps/s_time.c
index 9da140d05a..15b519aa38 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -668,7 +668,7 @@ static SSL *doConnection(SSL *scon)
 			width=i+1;
 			FD_ZERO(&readfds);
 			FD_SET(i,&readfds);
-			/* Note: under VMS with SOCKETSHR the third parameter
+			/* Note: under VMS with SOCKETSHR the 2nd parameter
 			 * is currently of type (int *) whereas under other
 			 * systems it is (void *) if you don't have a cast it
 			 * will choke the compiler: if you do have a cast then
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 07c9edd33c..b8cc795146 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -596,7 +596,7 @@ int BIO_accept(int sock, char **addr)
 
 	memset((char *)&from,0,sizeof(from));
 	len=sizeof(from);
-	/* Note: under VMS with SOCKETSHR the third parameter is currently
+	/* Note: under VMS with SOCKETSHR the fourth parameter is currently
 	 * of type (int *) whereas under other systems it is (void *) if
 	 * you don't have a cast it will choke the compiler: if you do
 	 * have a cast then you can either go for (int *) or (void *).
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index e6961f2305..50a4eb41f2 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -70,8 +70,8 @@
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #endif
 
-#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl, 
-			      and that isn't in VMS < 7.0 */
+#if (defined(VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 21c379ed1a..7080cfdd59 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -70,8 +70,8 @@
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #endif
 
-#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl,
-			      and that isn't in VMS < 7.0 */
+#if (defined(VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif