[openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  2b43b747d6897405e0fe7492ba11928bf18645db (commit)
      from  7e47db5b5645cf6728d8fe13f930bad026c64689 (commit)


- Log -----------------------------------------------------------------
commit 2b43b747d6897405e0fe7492ba11928bf18645db
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Tue Jul 2 21:33:42 2019 +0200

    Fix a typo and a syntax error in opensslconf.h
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9298)

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

Summary of changes:
 include/openssl/opensslconf.h.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index 6c6b4f3..b0d339a 100644
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -85,7 +85,7 @@ extern "C" {
 
 /* In case someone defined both */
 # if defined(OPENSSL_API_COMPAT) && defined(OPENSSL_API_LEVEL)
-#  error "Disallowed to defined both OPENSSL_API_COMPAT and OPENSSL_API_LEVEL"
+#  error "Disallowed to define both OPENSSL_API_COMPAT and OPENSSL_API_LEVEL"
 # endif
 
 # ifndef OPENSSL_API_COMPAT
@@ -100,7 +100,7 @@ extern "C" {
 #  elif (OPENSSL_API_COMPAT & 0xFFF00000L) == 0x10100000L
 #   define OPENSSL_API_LEVEL 2
 #  else
-/ * Major number 3 to 15 */
+    /* Major number 3 to 15 */
 #   define OPENSSL_API_LEVEL ((OPENSSL_API_COMPAT >> 28) & 0xF)
 #  endif
 # endif