diff options
| author | Randall S. Becker <randall.becker@nexbridge.ca> | 2024-04-19 22:15:10 +0000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-04-24 09:35:29 +0200 |
| commit | 0339382abad578ccb3989799ea2fb99dfb2d099b (patch) | |
| tree | 6a25b6c799f06c9c6d3055a487099e96327af036 /apps/lib | |
| parent | ca43171b3c38cd8bcd6de8ec11a3b34751cd5a8b (diff) | |
Remove all references to FLOSS for NonStop Builds.
FLOSS is no longer a dependency for NonStop as of the deprecation of the SPT
thread model builds.
Fixes: #24214
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24217)
Diffstat (limited to 'apps/lib')
| -rw-r--r-- | apps/lib/apps.c | 15 | ||||
| -rw-r--r-- | apps/lib/http_server.c | 6 | ||||
| -rw-r--r-- | apps/lib/s_socket.c | 6 |
3 files changed, 0 insertions, 27 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c index c87f0f02f1..619fd07712 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -2952,11 +2952,6 @@ int raw_read_stdin(void *buf, int siz) return recv(fileno_stdin(), buf, siz, 0); } #else -# if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include <floss.h(floss_read)> -# endif -# endif int raw_read_stdin(void *buf, int siz) { return read(fileno_stdin(), buf, siz); @@ -2975,21 +2970,11 @@ int raw_write_stdout(const void *buf, int siz) } #elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) \ && defined(_SPT_MODEL_) -# if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include <floss.h(floss_write)> -# endif -# endif int raw_write_stdout(const void *buf, int siz) { return write(fileno(stdout), (void *)buf, siz); } #else -# if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include <floss.h(floss_write)> -# endif -# endif int raw_write_stdout(const void *buf, int siz) { return write(fileno_stdout(), buf, siz); diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c index 0bdeaeb5f7..8a8c8897d3 100644 --- a/apps/lib/http_server.c +++ b/apps/lib/http_server.c @@ -26,12 +26,6 @@ #include "s_apps.h" #include "log.h" -#if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include <floss.h(floss_fork)> -# endif -#endif - #define HTTP_PREFIX "HTTP/" #define HTTP_VERSION_PATT "1." /* allow 1.x */ #define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c index ace51686ad..46c0028223 100644 --- a/apps/lib/s_socket.c +++ b/apps/lib/s_socket.c @@ -41,12 +41,6 @@ typedef unsigned int u_int; # include "s_apps.h" # include "internal/sockets.h" -# if defined(__TANDEM) -# if defined(OPENSSL_TANDEM_FLOSS) -# include <floss.h(floss_read)> -# endif -# endif - # include <openssl/bio.h> # include <openssl/err.h> |