From 15dbf3a5a1ec27315753ef5a9148f6ad69277909 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 23 Sep 2019 06:26:57 +0200 Subject: [PATCH] include/openssl/macros.h: better OPENSSL_FUNC fallback Make sure OPENSSL_FUNC gets defined to something, no matter what. Reviewed-by: Paul Dale Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/9976) --- include/openssl/macros.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/openssl/macros.h b/include/openssl/macros.h index a06b869522..78fbd38698 100644 --- a/include/openssl/macros.h +++ b/include/openssl/macros.h @@ -143,9 +143,6 @@ * * If none of the above applies, we check if the compiler is MSVC, * and use __FUNCTION__ if that's the case. - * - * If all these possibilities are exhausted, we give up and use a - * static string. */ # ifndef OPENSSL_FUNC # if defined(__STDC_VERSION__) @@ -156,7 +153,12 @@ # endif # elif defined(_MSC_VER) # define OPENSSL_FUNC __FUNCTION__ -# else +# endif +/* + * If all these possibilities are exhausted, we give up and use a + * static string. + */ +# ifndef OPENSSL_FUNC # define OPENSSL_FUNC "(unknown function)" # endif # endif -- 2.25.1