[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  0dd19e750f730b44a38ee5c8aaf235f690386f9b (commit)
      from  218e1263c4f2ac014859bcd6b72d0e66a3f75d95 (commit)


- Log -----------------------------------------------------------------
commit 0dd19e750f730b44a38ee5c8aaf235f690386f9b
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Sat Mar 20 01:31:45 2021 +0100

    Fix a windows build break
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/14635)

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

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

diff --git a/include/internal/unicode.h b/include/internal/unicode.h
index 3dcdcd2c89..a6de8352d6 100644
--- a/include/internal/unicode.h
+++ b/include/internal/unicode.h
@@ -18,12 +18,12 @@ typedef enum {
     UNICODE_LIMIT
 } UNICODE_CONSTANTS;
 
-static ossl_unused inline int is_unicode_surrogate(unsigned long value)
+static ossl_unused ossl_inline int is_unicode_surrogate(unsigned long value)
 {
     return value >= SURROGATE_MIN && value <= SURROGATE_MAX;
 }
 
-static ossl_unused inline int is_unicode_valid(unsigned long value)
+static ossl_unused ossl_inline int is_unicode_valid(unsigned long value)
 {
     return value <= UNICODE_MAX && !is_unicode_surrogate(value);
 }