projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid name clash.
[openssl.git]
/
crypto
/
ossl_typ.h
diff --git
a/crypto/ossl_typ.h
b/crypto/ossl_typ.h
index 2a66d484b973d8e83ba5e2c6f6a8a87de833d9fc..c9b494c854e98fb67f5c77a96ebf53e2de900a63 100644
(file)
--- a/
crypto/ossl_typ.h
+++ b/
crypto/ossl_typ.h
@@
-99,8
+99,10
@@
typedef struct asn1_pctx_st ASN1_PCTX;
#ifdef OPENSSL_SYS_WIN32
#undef X509_NAME
#ifdef OPENSSL_SYS_WIN32
#undef X509_NAME
+#undef X509_EXTENSIONS
#undef X509_CERT_PAIR
#undef PKCS7_ISSUER_AND_SERIAL
#undef X509_CERT_PAIR
#undef PKCS7_ISSUER_AND_SERIAL
+#undef OCSP_RESPONSE
#endif
#ifdef BIGNUM
#endif
#ifdef BIGNUM
@@
-164,6
+166,8
@@
typedef struct ui_method_st UI_METHOD;
typedef struct st_ERR_FNS ERR_FNS;
typedef struct engine_st ENGINE;
typedef struct st_ERR_FNS ERR_FNS;
typedef struct engine_st ENGINE;
+typedef struct ssl_st SSL;
+typedef struct ssl_ctx_st SSL_CTX;
typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;