From 75aad1519498c8f17cfda79391da5df1504768e3 Mon Sep 17 00:00:00 2001
From: Anis-cpu-13 <anisaityacoub7@gmail.com>
Date: Tue, 2 May 2023 14:59:11 +0200
Subject: [PATCH] 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)

(cherry picked from commit 0bf7e94c10f1b00510b8a36cdcbedc02a66468be)
---
 include/openssl/macros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index bcd42ec737b..aa7fbcc215a 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -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
-- 
2.47.2