diff options
| author | Lingmo Zhu <zlm2006@gmail.com> | 2017-08-02 20:55:40 +0800 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-08-03 10:23:08 +0100 |
| commit | 89fb0fb2a5391bd6cfd78bd201616ee68b5f5d34 (patch) | |
| tree | ded86d0424f6c20ef39826081b9e2a3c85fc546e /include | |
| parent | 15b3fd6f647f340d83cfffbd9a34097883ec9271 (diff) | |
remove horrible pragma macro and remove __owur from SSL_CTX_add_session() declaration
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4014)
(cherry picked from commit 5bd05e579994c756cd994b5e0ff5f395aae6bfff)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 6f0f361d7e..2c694b4735 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1444,7 +1444,7 @@ int SSL_SESSION_up_ref(SSL_SESSION *ses); void SSL_SESSION_free(SSL_SESSION *ses); __owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); __owur int SSL_set_session(SSL *to, SSL_SESSION *session); -__owur int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c); +int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c); int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c); __owur int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB); __owur int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB); |