Skip to content

Commit

Permalink
Replace __attribute__((malloc)) with __attribute__((__malloc__)) in m…
Browse files Browse the repository at this point in the history
…acros.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 #20869)

(cherry picked from commit 0bf7e94)
  • Loading branch information
Anis-cpu-13 authored and t8m committed May 25, 2023
1 parent e45c984 commit 75aad15
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/openssl/macros.h
Expand Up @@ -314,7 +314,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
Expand Down

0 comments on commit 75aad15

Please sign in to comment.