From e627a13cd58a54df830e0fc2853f3ea8862699f2 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 28 Feb 2017 14:06:14 +0100 Subject: [PATCH] Code health: Remove obvious VAX C fixups Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2775) --- apps/ca.c | 6 +----- apps/s_apps.h | 25 ------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/apps/ca.c b/apps/ca.c index 00fb6f5aba..9428c3018a 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -28,11 +28,7 @@ #ifndef W_OK # ifdef OPENSSL_SYS_VMS -# if defined(__DECC) -# include -# else -# include -# endif +# include # elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) # include # endif diff --git a/apps/s_apps.h b/apps/s_apps.h index 22b65b769a..bf27de2fae 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -17,31 +17,6 @@ # define _kbhit kbhit #endif -#if defined(OPENSSL_SYS_VMS) && !defined(FD_SET) -/* - * VAX C does not defined fd_set and friends, but it's actually quite simple - */ -/* These definitions are borrowed from SOCKETSHR. /Richard Levitte */ -# define MAX_NOFILE 32 -# define NBBY 8 /* number of bits in a byte */ - -# ifndef FD_SETSIZE -# define FD_SETSIZE MAX_NOFILE -# endif /* FD_SETSIZE */ - -/* How many things we'll allow select to use. 0 if unlimited */ -# define MAXSELFD MAX_NOFILE -typedef int fd_mask; /* int here! VMS prototypes int, not long */ -# define NFDBITS (sizeof(fd_mask) * NBBY)/* bits per mask (power of 2!) */ -# define NFDSHIFT 5 /* Shift based on above */ - -typedef fd_mask fd_set; -# define FD_SET(n, p) (*(p) |= (1 << ((n) % NFDBITS))) -# define FD_CLR(n, p) (*(p) &= ~(1 << ((n) % NFDBITS))) -# define FD_ISSET(n, p) (*(p) & (1 << ((n) % NFDBITS))) -# define FD_ZERO(p) memset((p), 0, sizeof(*(p))) -#endif - #define PORT "4433" #define PROTOCOL "tcp" -- GitLab