From: Anis-cpu-13 <anisaityacoub7@gmail.com>
Date: Tue, 2 May 2023 12:59:11 +0000 (+0200)
Subject: Replace __attribute__((malloc)) with __attribute__((__malloc__)) in macros.h
X-Git-Tag: openssl-3.2.0-alpha1~748
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bf7e94c10f1b00510b8a36cdcbedc02a66468be;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index b59c6ed3417..4579fc8eb3d 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