From: Richard Levitte <levitte@openssl.org>
Date: Mon, 23 Sep 2019 04:26:57 +0000 (+0200)
Subject: include/openssl/macros.h: better OPENSSL_FUNC fallback
X-Git-Tag: openssl-3.0.0-alpha1~1300
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15dbf3a5a1ec27315753ef5a9148f6ad69277909;p=oweals%2Fopenssl.git

include/openssl/macros.h: better OPENSSL_FUNC fallback

Make sure OPENSSL_FUNC gets defined to something, no matter what.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9976)
---

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