diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:34:57 +0200 |
| commit | 8cd093f61168a373d919c68e0ce4e04949fa4eb6 (patch) | |
| tree | d1bc1dd33da84a22d6ab30aa9f7efb79b592ffda /openssl/crypto/stack/safestack.h | |
| parent | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (diff) | |
| parent | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (diff) | |
| download | vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.gz vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.tar.bz2 vcxsrv-8cd093f61168a373d919c68e0ce4e04949fa4eb6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/stack/safestack.h')
| -rw-r--r-- | openssl/crypto/stack/safestack.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/openssl/crypto/stack/safestack.h b/openssl/crypto/stack/safestack.h index ea3aa0d80..bc194cb26 100644 --- a/openssl/crypto/stack/safestack.h +++ b/openssl/crypto/stack/safestack.h @@ -57,6 +57,10 @@ #include <openssl/stack.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifndef CHECKED_PTR_OF #define CHECKED_PTR_OF(type, p) \ ((void*) (1 ? p : (type*)0)) @@ -2660,4 +2664,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh) /* End of util/mkstack.pl block, you may now edit :-) */ + +#ifdef __cplusplus +} +#endif #endif /* !defined HEADER_SAFESTACK_H */ |