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 /ssl | |
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 'ssl')
-rw-r--r-- | ssl/ssl_sess.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 8fd5f396aa..f0274cf296 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -535,10 +535,7 @@ int ssl_get_prev_session(SSL *s, const PACKET *ext, const PACKET *session_id) * interrupt the session resumption process. The return * value is intentionally ignored. */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" SSL_CTX_add_session(s->session_ctx, ret); -#pragma GCC diagnostic pop } } } |