diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-09-04 21:51:17 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-09-12 17:59:52 +0200 |
| commit | c659882c9892788085fcdd4e8c47f98c01edf9ad (patch) | |
| tree | 14b6b0fcdafc2f19d6cab88702bff950975cff84 /include | |
| parent | 0cd1b144f99e9aabea15a158bd567cba81592039 (diff) | |
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)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/macros.h | 4 |
1 files 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__) |