diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-08-21 17:22:19 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-08-22 14:15:40 -0400 |
| commit | 0e97f1e1a7f43be3a5e5c6256fe6bcb90caf9e01 (patch) | |
| tree | 640bd7aea51a53d5e98666aa8ef2cb78270bdff6 /crypto | |
| parent | 94e1f8ab5a9e5996d1808f236c77343acfad9d33 (diff) | |
(Re)move some things from e_os.h
Remove GETPID_IS_MEANINGLESS and osslargused.
Move socket-related things to new file internal/sockets.h; this is now
only needed by four(!!!) files. Compiles should be a bit faster.
Remove USE_SOCKETS ifdef's
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4209)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bio_lcl.h | 2 | ||||
| -rw-r--r-- | crypto/bio/bss_sock.c | 1 | ||||
| -rw-r--r-- | crypto/mem.c | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h index 337621be7f..e2c05a20de 100644 --- a/crypto/bio/bio_lcl.h +++ b/crypto/bio/bio_lcl.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#define USE_SOCKETS #include "e_os.h" +#include "internal/sockets.h" #include "internal/refcount.h" /* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */ diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index 744b768d12..71be1cde83 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -9,7 +9,6 @@ #include <stdio.h> #include <errno.h> -#define USE_SOCKETS #include "bio_lcl.h" #include "internal/cryptlib.h" diff --git a/crypto/mem.c b/crypto/mem.c index 81a73ccdde..947c50ed21 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -187,7 +187,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line) ret = malloc(num); } #else - osslargused(file); osslargused(line); + (void)(file); (void)(line); ret = malloc(num); #endif @@ -228,7 +228,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line) return ret; } #else - osslargused(file); osslargused(line); + (void)(file); (void)(line); #endif return realloc(str, num); |