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/ossl_typ.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/ossl_typ.h')
| -rw-r--r-- | openssl/crypto/ossl_typ.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openssl/crypto/ossl_typ.h b/openssl/crypto/ossl_typ.h index ea9227f6f..12cdd43be 100644 --- a/openssl/crypto/ossl_typ.h +++ b/openssl/crypto/ossl_typ.h @@ -55,6 +55,10 @@ #ifndef HEADER_OPENSSL_TYPES_H #define HEADER_OPENSSL_TYPES_H +#ifdef __cplusplus +extern "C" { +#endif + #include <openssl/e_os2.h> #ifdef NO_ASN1_TYPEDEFS @@ -199,4 +203,7 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; typedef struct ocsp_response_st OCSP_RESPONSE; typedef struct ocsp_responder_id_st OCSP_RESPID; +#ifdef __cplusplus +} +#endif #endif /* def HEADER_OPENSSL_TYPES_H */ |