[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  15dbf3a5a1ec27315753ef5a9148f6ad69277909 (commit)
      from  e3f3ee448f6c9d6765efc8739a09def8a04f0dc0 (commit)


- Log -----------------------------------------------------------------
commit 15dbf3a5a1ec27315753ef5a9148f6ad69277909
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Sep 23 06:26:57 2019 +0200

    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 at oracle.com>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9976)

-----------------------------------------------------------------------

Summary of changes:
 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