summaryrefslogtreecommitdiffstats
path: root/crypto/mem.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-08-21 17:22:19 -0400
committerRich Salz <rsalz@openssl.org>2017-08-22 14:15:40 -0400
commit0e97f1e1a7f43be3a5e5c6256fe6bcb90caf9e01 (patch)
tree640bd7aea51a53d5e98666aa8ef2cb78270bdff6 /crypto/mem.c
parent94e1f8ab5a9e5996d1808f236c77343acfad9d33 (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/mem.c')
-rw-r--r--crypto/mem.c4
1 files changed, 2 insertions, 2 deletions
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);