Remove NextStep support

Because of that we can remove OPENSSL_UNISTD and some other
macros from e_os2.h and opensslconf.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9204)

diff --git a/CHANGES b/CHANGES
index 8b70fa3dc4123c91e8c981313b51959da868f35c..f23e9b2febf5b911b5acf8d203a01ca5467794ef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
 
  Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]
 
+  *) Removed NextStep support and the macro OPENSSL_UNISTD
+     [Rich Salz]
+
   *) RC5_32_set_key has been changed to return an int type, with 0 indicating
      an error and 1 indicating success. In previous versions of OpenSSL this
      was a void type. If a key was set longer than the maximum possible this

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 4f5e3636f498bc629680ba078192e613b9952a4a..ad859902872013a11752841af5edc11a476df481 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1051,23 +1051,6 @@ my %targets = (
         shared_cflag     => "-fPIC",
     },
 
-    "nextstep" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "cc",
-        CFLAGS           => "-O -Wall",
-        unistd           => "<libc.h>",
-        bn_ops           => "BN_LLONG",
-        thread_scheme    => "(unknown)",
-    },
-    "nextstep3.3" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "cc",
-        CFLAGS           => "-O3 -Wall",
-        unistd           => "<libc.h>",
-        bn_ops           => "BN_LLONG",
-        thread_scheme    => "(unknown)",
-    },
-
 #### SCO/Caldera targets.
 #
 # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.

diff --git a/Configure b/Configure
index 6d9451efcd8f9d1d5b2723746bbce034252de6c5..987eb748beecc41caac492f8193acce4c9307498 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -3314,7 +3314,6 @@ sub print_table_entry
         "includes",
         "cc",
         "cflags",
-        "unistd",
         "ld",
         "lflags",
         "loutflag",

diff --git a/apps/opt.c b/apps/opt.c
index f4a4e125818e056ac616d879cb95ffb6adbcafc9..c2a5878ef68d1b07e15998fbc3a4171d75ce8d02 100644 (file)
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -15,7 +15,7 @@
 #include "internal/nelem.h"
 #include <string.h>
 #if !defined(OPENSSL_SYS_MSDOS)
-# include OPENSSL_UNISTD
+# include <unistd.h>
 #endif
 
 #include <stdlib.h>

diff --git a/apps/s_time.c b/apps/s_time.c
index e436b57ad02b45af1e3ff5d9dc0ede7b8c6a3509..39e3d4bb48fb2b0d1a6f0af5e9c68fc073daa9e1 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -24,7 +24,7 @@
 #include <openssl/err.h>
 #include <internal/sockets.h>
 #if !defined(OPENSSL_SYS_MSDOS)
-# include OPENSSL_UNISTD
+# include <unistd.h>
 #endif
 
 #define SSL_CONNECT_NAME        "localhost:4433"

diff --git a/apps/speed.c b/apps/speed.c
index 0f3ca9ca768924ba1fcee4cfe021ef30b3d18e22..b0cbdf43bb99f2ae95fa5bd3f042dc4e38a9a6d3 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -29,7 +29,7 @@
 #include <openssl/objects.h>
 #include <openssl/async.h>
 #if !defined(OPENSSL_SYS_MSDOS)
-# include OPENSSL_UNISTD
+# include <unistd.h>
 #endif
 
 #if defined(_WIN32)

diff --git a/config b/config
index 0755961ec6de06da1ed96ff1f855421bba9de58e..755d5387ffbbcf571d328e4fc9d753c198b2ed13 100755 (executable)
--- a/config
+++ b/config
@@ -349,17 +349,6 @@ if [ -d /usr/apollo ]; then
     exit 0
 fi
 
-# Now NeXT
-ISNEXT=`hostinfo 2>/dev/null`
-case "$ISNEXT" in
-    *'NeXT Mach 3.3'*)
-       echo "whatever-next-nextstep3.3"; exit 0
-       ;;
-    *NeXT*)
-       echo "whatever-next-nextstep"; exit 0
-       ;;
-esac
-
 # At this point we gone through all the one's
 # we know of: Punt
 

diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index ef552119b8ccd4963964540f332eafc1e26aaf98..bac8d609c4ecaa3098f2a51c4d8f572dd69d1bb7 100644 (file)
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -38,7 +38,7 @@ int RAND_egd_bytes(const char *path, int bytes)
 
 # else
 
-#  include OPENSSL_UNISTD
+#  include <unistd.h>
 #  include <stddef.h>
 #  include <sys/types.h>
 #  include <sys/socket.h>

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 2b5e5c1f02cd569873b038a1c1fb0762559dbb41..4c1ec554ba897d411be93ffc6da1638fef6520c0 100644 (file)
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -34,11 +34,7 @@
 # include <errno.h>
 
 # if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
-#  ifdef OPENSSL_UNISTD
-#   include OPENSSL_UNISTD
-#  else
-#   include <unistd.h>
-#  endif
+#  include <unistd.h>
 /*
  * If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX
  * system and have sigaction and termios.

diff --git a/crypto/uid.c b/crypto/uid.c
index 3ae93f6b47928faea234c396f6f13a9f4ea36211..55e276dfe4596341ccabfca9b7ba2c50449b381b 100644 (file)
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -19,7 +19,7 @@ int OPENSSL_issetugid(void)
 
 #elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__)
 
-# include OPENSSL_UNISTD
+# include <unistd.h>
 
 int OPENSSL_issetugid(void)
 {
@@ -28,7 +28,7 @@ int OPENSSL_issetugid(void)
 
 #else
 
-# include OPENSSL_UNISTD
+# include <unistd.h>
 # include <sys/types.h>
 
 # if defined(__GLIBC__) && defined(__GLIBC_PREREQ)

diff --git a/e_os.h b/e_os.h
index 95ec0d6976ac144397a67d7272d18685e557b35c..5c887d4279379b05c1814a7b9c91ddbfb7a0edb9 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -257,11 +257,7 @@ extern FILE *_imp___iob;
 
 #  else
      /* !defined VMS */
-#   ifdef OPENSSL_UNISTD
-#    include OPENSSL_UNISTD
-#   else
-#    include <unistd.h>
-#   endif
+#   include <unistd.h>
 #   include <sys/types.h>
 #   ifdef OPENSSL_SYS_WIN32_CYGWIN
 #    include <io.h>

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 50ce937fd1542da68643a6acd83609fb828caa5f..250b3e24714ae895ad23309bbbe281a6d64e7d0f 100644 (file)
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -136,15 +136,6 @@ extern "C" {
  * That's it for OS-specific stuff
  *****************************************************************************/
 
-/* Specials for I/O an exit */
-# ifdef OPENSSL_SYS_MSDOS
-#  define OPENSSL_UNISTD_IO <io.h>
-#  define OPENSSL_DECLARE_EXIT extern void exit(int);
-# else
-#  define OPENSSL_UNISTD_IO OPENSSL_UNISTD
-#  define OPENSSL_DECLARE_EXIT  /* declared in unistd.h */
-# endif
-
 /*-
  * OPENSSL_EXTERN is normally used to declare a symbol with possible extra
  * attributes to handle its presence in a shared library.

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index ca680bc3883e4dd90b8a994b619f58f2423a8f02..0f99079c5ca0081c91270eb41ffbcddae1a5a8f9 100644 (file)
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -165,9 +165,6 @@ extern "C" {
 /* Generate 80386 code? */
 {- $config{processor} eq "386" ? "# define" : "# undef" -} I386_ONLY
 
-# undef OPENSSL_UNISTD
-# define OPENSSL_UNISTD {- $target{unistd} -}
-
 {- $config{export_var_as_fn} ? "# define" : "# undef" -} OPENSSL_EXPORT_VAR_AS_FUNCTION
 
 /*

diff --git a/test/ssltest_old.c b/test/ssltest_old.c
index 390ca88bb7262b73859fbe46f880ca4227f646b8..971015c6e67f2e688ac43fe4220e8dc7816efa75 100644 (file)
--- a/test/ssltest_old.c
+++ b/test/ssltest_old.c
@@ -71,7 +71,7 @@
 #ifdef OPENSSL_SYS_WINDOWS
 # include <winsock.h>
 #else
-# include OPENSSL_UNISTD
+# include <unistd.h>
 #endif
 
 static SSL_CTX *s_ctx = NULL;