From e03b29871b2b87af9a4ec21c49eb3e1826eb772a Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Fri, 19 Dec 2014 21:11:09 -0500 Subject: [PATCH] RT3548: Remove outdated platforms This commit removes all mention of NeXT and NextStep. Reviewed-by: Richard Levitte --- CHANGES | 3 ++- crypto/des/des_old.h | 4 ++-- crypto/ec/ectest.c | 2 -- e_os.h | 10 ---------- e_os2.h | 2 +- ssl/ssltest.c | 2 -- util/mkdef.pl | 2 +- 7 files changed, 6 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 34a85b23d1..5a32715cdb 100644 --- a/CHANGES +++ b/CHANGES @@ -28,7 +28,8 @@ *) Remove various unsupported platforms: Sony NEWS4 - Remove BEOS and BEOS_R5 + BEOS and BEOS_R5 + NeXT [Rich Salz] *) Experimental support for a new, fast, unbiased prime candidate generator, diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h index 2b2c372354..fab1c0668c 100644 --- a/crypto/des/des_old.h +++ b/crypto/des/des_old.h @@ -178,7 +178,7 @@ typedef struct _ossl_old_des_ks_struct #if 0 #define des_crypt(b,s)\ DES_crypt((b),(s)) -#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) +#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(__OpenBSD__) #define crypt(b,s)\ DES_crypt((b),(s)) #endif @@ -375,7 +375,7 @@ int _ossl_old_des_enc_write(int fd,char *buf,int len,_ossl_old_des_key_schedule _ossl_old_des_cblock *iv); char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret); char *_ossl_old_des_crypt(const char *buf,const char *salt); -#if !defined(PERL5) && !defined(NeXT) +#if !defined(PERL5) char *_ossl_old_crypt(const char *buf,const char *salt); #endif void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out, diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c index 6da927905a..16cf43f0ed 100644 --- a/crypto/ec/ectest.c +++ b/crypto/ec/ectest.c @@ -164,8 +164,6 @@ static void timings(EC_GROUP *group, int type, BN_CTX *ctx) * -- ISO/IEC 9899 */ # define UNIT "s" #else - /* "`CLOCKS_PER_SEC' undeclared (first use this function)" - * -- cc on NeXTstep/OpenStep */ # define UNIT "units" # define CLOCKS_PER_SEC 1 #endif diff --git a/e_os.h b/e_os.h index d0c8ed5924..23daaf1a7d 100644 --- a/e_os.h +++ b/e_os.h @@ -432,11 +432,6 @@ static __inline unsigned int _strlen31(const char *str) # ifndef NO_SYS_TYPES_H # include # endif -# if defined(NeXT) -# define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP - * (unless when compiling with -D_POSIX_SOURCE, - * which doesn't work for us) */ -# endif # ifdef OPENSSL_SYS_WIN32_CYGWIN # include # include @@ -560,11 +555,6 @@ static __inline unsigned int _strlen31(const char *str) # include # endif -# if defined(NeXT) || defined(_NEXT_SOURCE) -# include -# include -# endif - # ifdef OPENSSL_SYS_AIX # include # endif diff --git a/e_os2.h b/e_os2.h index 68801f419e..aa4c10ce7e 100644 --- a/e_os2.h +++ b/e_os2.h @@ -269,7 +269,7 @@ extern "C" { # define ossl_ssize_t long #endif -#if defined(NeXT) || defined(OPENSSL_SYS_SUNOS) +#if defined(OPENSSL_SYS_SUNOS) # define ssize_t int #endif diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 05f75aab12..e5be634b95 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -1852,8 +1852,6 @@ bad: (double)s_time/CLOCKS_PER_SEC, (double)c_time/CLOCKS_PER_SEC); #else - /* "`CLOCKS_PER_SEC' undeclared (first use this function)" - * -- cc on NeXTstep/OpenStep */ BIO_printf(bio_stdout, "Approximate total server time: %6.2f units\n" "Approximate total client time: %6.2f units\n", diff --git a/util/mkdef.pl b/util/mkdef.pl index fa3f3dbe76..ccd72f5887 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -78,7 +78,7 @@ my $OS2=0; # Set this to make typesafe STACK definitions appear in DEF my $safe_stack_def = 0; -my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", +my @known_platforms = ( "__FreeBSD__", "PERL5", "EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS", "OPENSSL_FIPSCAPABLE" ); my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" ); -- 2.25.1