From c659882c9892788085fcdd4e8c47f98c01edf9ad Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 4 Sep 2019 21:51:17 +0200 Subject: [PATCH] include/openssl/macros.h: Remove the PEDANTIC OPENSSL_FUNC definition There was a section to define OPENSSL_FUNC that depended on PEDANTIC being defined. That is an internal build macro that should never appear in a public header. The solution was simple, replace it with a check of __STRICT_ANSI__. Fixes #9756 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9756) --- include/openssl/macros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/openssl/macros.h b/include/openssl/macros.h index 08966716f2..da5d155680 100644 --- a/include/openssl/macros.h +++ b/include/openssl/macros.h @@ -134,8 +134,8 @@ # ifndef OPENSSL_FUNC # if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L # define OPENSSL_FUNC __func__ -# elif defined(__STDC__) && defined(PEDANTIC) -# define OPENSSL_FUNC "(PEDANTIC disallows function name)" +# elif defined(__STRICT_ANSI__) +# define OPENSSL_FUNC "(unknown function)" # elif defined(_MSC_VER) || (defined(__GNUC__) && __GNUC__ >= 2) # define OPENSSL_FUNC __FUNCTION__ # elif defined(__FUNCSIG__) -- 2.34.1