diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2002-02-02 14:19:27 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2002-02-02 14:19:27 +0100 |
| commit | 1955b8742354a989650853412c27863f1644e81d (patch) | |
| tree | bd9ba9482eeb865c943bd282fb8f576d3aaa3299 /crypto/ossl_typ.h | |
| parent | Shut up compiler warnings for inconsistent declarations. (diff) | |
| download | openssl-1955b8742354a989650853412c27863f1644e81d.tar.xz openssl-1955b8742354a989650853412c27863f1644e81d.zip | |
#undef some things that cause a conflict under Win32 when
wincrypt.h is included.
Diffstat (limited to 'crypto/ossl_typ.h')
| -rw-r--r-- | crypto/ossl_typ.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h index b3aa586b18..6bd42aee4d 100644 --- a/crypto/ossl_typ.h +++ b/crypto/ossl_typ.h @@ -93,6 +93,11 @@ typedef int ASN1_BOOLEAN; typedef int ASN1_NULL; #endif +#ifdef OPENSSL_SYS_WIN32 +#undef X509_NAME +#undef PKCS7_ISSUER_AND_SERIAL +#endif + typedef struct evp_cipher_st EVP_CIPHER; typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; typedef struct env_md_st EVP_MD; |