diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-11-18 18:08:43 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-11-18 18:08:43 +0000 |
| commit | 767af0dbc4f9a51d6d3db858f77935a2c26db66b (patch) | |
| tree | d7ef36c1dda6e3d97e6b6054c2c6776629fdb733 /include | |
| parent | 38926fce3cbececc31d1df806e1a6b3d7416cc9e (diff) | |
Merged revisions 295441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r295441 | pabelanger | 2010-11-18 13:02:12 -0500 (Thu, 18 Nov 2010) | 11 lines
Merged revisions 295440 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r295440 | pabelanger | 2010-11-18 12:51:34 -0500 (Thu, 18 Nov 2010) | 4 lines
Fix compiler warnings when using openssl-dev 1.0.0+
Review: https://reviewboard.asterisk.org/r/1016/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/jabber.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/jabber.h b/include/asterisk/jabber.h index 3965f7a0f..85d459cf4 100644 --- a/include/asterisk/jabber.h +++ b/include/asterisk/jabber.h @@ -164,7 +164,7 @@ struct aji_client { #ifdef HAVE_OPENSSL SSL_CTX *ssl_context; SSL *ssl_session; - SSL_METHOD *ssl_method; + const SSL_METHOD *ssl_method; unsigned int stream_flags; #endif /* HAVE_OPENSSL */ enum aji_state state; |