From: Mat <mberchtold@gmail.com>
Date: Sat, 9 Jan 2016 19:15:28 +0000 (+0100)
Subject: Fix c++ compilation
X-Git-Tag: OpenSSL_1_1_0-pre2~88
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f820b79248140419c1c2ced9873aa1d78b665a76

Fix c++ compilation

Fixes https://github.com/openssl/openssl/issues/532

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index bbfb48e4ba..3e7f16cbcf 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