projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77f31b3
)
Fix c++ compilation
author
Mat
<mberchtold@gmail.com>
Sat, 9 Jan 2016 19:15:28 +0000
(20:15 +0100)
committer
Rich Salz
<rsalz@openssl.org>
Sun, 10 Jan 2016 00:05:44 +0000
(19:05 -0500)
Fixes https://github.com/openssl/openssl/issues/532
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
include/openssl/e_os2.h
patch
|
blob
|
history
diff --git
a/include/openssl/e_os2.h
b/include/openssl/e_os2.h
index bbfb48e4babd3306711fe3b932055f0e8ddfbc5b..3e7f16cbcf32241ce8e433bae853f4ddf908cc8c 100644
(file)
--- 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