[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f820b79248140419c1c2ced9873aa1d78b665a76 (commit)
      from  77f31b3a8a7a2c3ee5a3a4da9843b4b224b32300 (commit)


- Log -----------------------------------------------------------------
commit f820b79248140419c1c2ced9873aa1d78b665a76
Author: Mat <mberchtold at gmail.com>
Date:   Sat Jan 9 20:15:28 2016 +0100

    Fix c++ compilation
    
    Fixes https://github.com/openssl/openssl/issues/532
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 include/openssl/e_os2.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index bbfb48e..3e7f16c 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -348,6 +348,8 @@ typedef unsigned __int64 uint64_t;
 #  else
 #   define ossl_inline
 #  endif
+# else
+#  define ossl_inline inline
 # endif
 
 #ifdef  __cplusplus