diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-06-26 13:40:15 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-07-08 11:49:44 +0200 |
| commit | f1f5ee17b64397eecfde39960ca11e94064297bd (patch) | |
| tree | 811a0a155a461065aecca798e7b7e090de7b80d9 /include/openssl/ossl_typ.h | |
| parent | ab6a591caa561017f881ed36028177f9582a74c6 (diff) | |
| download | openssl-f1f5ee17b64397eecfde39960ca11e94064297bd.tar.gz | |
include/openssl: don't include <windows.h> in public headers.
If application uses any of Windows-specific interfaces, make it
application developer's respondibility to include <windows.h>.
Rationale is that <windows.h> is quite "toxic" and is sensitive
to inclusion order (most notably in relation to <winsock2.h>).
It's only natural to give complete control to the application developer.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'include/openssl/ossl_typ.h')
| -rw-r--r-- | include/openssl/ossl_typ.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h index adc50ed284..129a67f057 100644 --- a/include/openssl/ossl_typ.h +++ b/include/openssl/ossl_typ.h @@ -63,10 +63,11 @@ typedef struct ASN1_ITEM_st ASN1_ITEM; typedef struct asn1_pctx_st ASN1_PCTX; typedef struct asn1_sctx_st ASN1_SCTX; -# ifdef OPENSSL_SYS_WIN32 +# ifdef _WIN32 # undef X509_NAME # undef X509_EXTENSIONS # undef PKCS7_ISSUER_AND_SERIAL +# undef PKCS7_SIGNER_INFO # undef OCSP_REQUEST # undef OCSP_RESPONSE # endif |