diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-21 13:14:26 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-24 08:06:50 +0200 |
| commit | cdb5129e5c5fd8ad678c5efb1e87c91595d907b4 (patch) | |
| tree | 99f2eb87e71f0ee3c8cba9a953667a670448b5fe | |
| parent | Configure: Show 'enable' and 'disable' config attributes (diff) | |
| download | openssl-cdb5129e5c5fd8ad678c5efb1e87c91595d907b4.tar.xz openssl-cdb5129e5c5fd8ad678c5efb1e87c91595d907b4.zip | |
Use OPENSSL_SYS_TANDEM instead of OPENSSL_SYSNAME_TANDEM
This streamlines with all other config targets, and draws from the
'sys_id' config attribute.
Fixes #12858
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12933)
| -rw-r--r-- | apps/ca.c | 2 | ||||
| -rw-r--r-- | apps/lib/apps.c | 2 | ||||
| -rw-r--r-- | crypto/rand/rand_egd.c | 6 | ||||
| -rw-r--r-- | include/internal/sockets.h | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -26,7 +26,7 @@ #ifndef W_OK # ifdef OPENSSL_SYS_VMS # include <unistd.h> -# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYSNAME_TANDEM) +# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_TANDEM) # include <sys/file.h> # endif #endif diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 9c608e6582..c0c56d9c22 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -2410,7 +2410,7 @@ int raw_write_stdout(const void *buf, int siz) else return -1; } -#elif defined(OPENSSL_SYSNAME_TANDEM) && defined(OPENSSL_THREADS) && defined(_SPT_MODEL_) +#elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) && defined(_SPT_MODEL_) # if defined(__TANDEM) # if defined(OPENSSL_TANDEM_FLOSS) # include <floss.h(floss_write)> diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index c6dcd87f04..dc1833169c 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -54,7 +54,7 @@ struct sockaddr_un { # include <string.h> # include <errno.h> -# if defined(OPENSSL_SYSNAME_TANDEM) +# if defined(OPENSSL_SYS_TANDEM) /* * HPNS: * @@ -125,7 +125,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) return -1; strcpy(addr.sun_path, path); i = offsetof(struct sockaddr_un, sun_path) + strlen(path); -#if defined(OPENSSL_SYSNAME_TANDEM) +#if defined(OPENSSL_SYS_TANDEM) fd = hpns_socket(AF_UNIX, SOCK_STREAM, 0, AF_UNIX_COMPATIBILITY); #else fd = socket(AF_UNIX, SOCK_STREAM, 0); @@ -158,7 +158,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) /* No error, try again */ break; default: -# if defined(OPENSSL_SYSNAME_TANDEM) +# if defined(OPENSSL_SYS_TANDEM) if (hpns_connect_attempt == 0) { /* try the other kind of AF_UNIX socket */ close(fd); diff --git a/include/internal/sockets.h b/include/internal/sockets.h index e3a6bd459b..e86ae8a09e 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -145,7 +145,7 @@ struct servent *PASCAL getservbyname(const char *, const char *); # define closesocket(s) close(s) # define readsocket(s,b,n) read((s),(b),(n)) # define writesocket(s,b,n) write((s),(char *)(b),(n)) -# elif defined(OPENSSL_SYSNAME_TANDEM) +# elif defined(OPENSSL_SYS_TANDEM) # if defined(OPENSSL_TANDEM_FLOSS) # include <floss.h(floss_read, floss_write)> # define readsocket(s,b,n) floss_read((s),(b),(n)) |