From 89d72311327735ef15c804d2adea84a0fb1bfa0a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 28 Oct 2022 12:11:30 +0200 Subject: [PATCH] crypto/dso/dso_vms.c: Better definition of DSO_MALLOC() Now we cover all possible cases. Reviewed-by: Matt Caswell Reviewed-by: Dmitry Belyavskiy Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/19529) --- crypto/dso/dso_vms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c index 236b1924d4..6c84bb1988 100644 --- a/crypto/dso/dso_vms.c +++ b/crypto/dso/dso_vms.c @@ -22,6 +22,7 @@ # include "../vms_rms.h" /* Some compiler options may mask the declaration of "_malloc32". */ +# define DSO_MALLOC OPENSSL_malloc # if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE # if __INITIAL_POINTER_SIZE == 64 # pragma pointer_size save @@ -37,10 +38,9 @@ static void *dso_malloc(__size_t num, const char *file, int line) } return ret; } +# undef DSO_MALLOC # define DSO_MALLOC(num) dso_malloc((num), OPENSSL_FILE, OPENSSL_LINE) # pragma pointer_size restore -# else /* __INITIAL_POINTER_SIZE == 64 */ -# define DSO_MALLOC OPENSSL_malloc # endif /* __INITIAL_POINTER_SIZE == 64 [else] */ # endif /* __INITIAL_POINTER_SIZE && defined * _ANSI_C_SOURCE */