diff options
| author | Anis-cpu-13 <anisaityacoub7@gmail.com> | 2023-05-02 14:59:11 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-05-25 17:53:00 +0200 |
| commit | 0bf7e94c10f1b00510b8a36cdcbedc02a66468be (patch) | |
| tree | feb133c13baddedbe2917079d761837a863faa5f /include | |
| parent | eab96453bb145cde8e447f420a4ba099a5fa7004 (diff) | |
Replace __attribute__((malloc)) with __attribute__((__malloc__)) in macros.h
Fix macro attribute conflict with cmocka
Fixes #20776
CLA: trivial
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20869)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/openssl/macros.h b/include/openssl/macros.h index b59c6ed341..4579fc8eb3 100644 --- a/include/openssl/macros.h +++ b/include/openssl/macros.h @@ -315,7 +315,7 @@ # ifndef OSSL_CRYPTO_ALLOC # if defined(__GNUC__) -# define OSSL_CRYPTO_ALLOC __attribute__((malloc)) +# define OSSL_CRYPTO_ALLOC __attribute__((__malloc__)) # elif defined(_MSC_VER) # define OSSL_CRYPTO_ALLOC __declspec(restrict) # else |