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/ssl.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/ssl.h')
| -rw-r--r-- | include/openssl/ssl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index d2736e2ceb..2669f73544 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1532,11 +1532,16 @@ __owur char *SSL_get_srp_userinfo(SSL *s); void SSL_certs_clear(SSL *s); void SSL_free(SSL *ssl); +# ifdef OSSL_ASYNC_FD +/* + * Windows applcation developer has to include windows.h to use these. + */ __owur int SSL_waiting_for_async(SSL *s); __owur int SSL_get_all_async_fds(SSL *s, OSSL_ASYNC_FD *fds, size_t *numfds); __owur int SSL_get_changed_async_fds(SSL *s, OSSL_ASYNC_FD *addfd, size_t *numaddfds, OSSL_ASYNC_FD *delfd, size_t *numdelfds); +# endif __owur int SSL_accept(SSL *ssl); __owur int SSL_connect(SSL *ssl); __owur int SSL_read(SSL *ssl, void *buf, int num); |