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 <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9756)

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 08966716f2a2cd23512d72ee7f6c6f4b824f55c8..da5d1556809045f8dae213f9426e9903479a044e 100644 (file)
--- 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__)