diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-16 13:11:28 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-16 13:11:28 +0000 |
| commit | 54fa33ea491bb1c47400d4534f649efbd47767e3 (patch) | |
| tree | e168d816fb4953825df0bad6d759e641ab426f01 | |
| parent | 16391af2e2f58047a6b47336e0b8970bbdaddb34 (diff) | |
* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): Fix compile error
with old version of fcc (Fujitsu C Compiler) on Solaris 10.
[Bug #12769] [ruby-dev:49809]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Sep 16 22:10:31 2016 Naohisa Goto <[email protected]> + + * ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): Fix compile error + with old version of fcc (Fujitsu C Compiler) on Solaris 10. + [Bug #12769] [ruby-dev:49809] + Fri Sep 16 21:28:25 2016 Naohisa Goto <[email protected]> * internal.h (MAYBE_UNUSED): The fallback definition is needed. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 053613adae..861f820dbd 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -636,7 +636,11 @@ ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out, { VALUE selected; int status; - struct npn_select_cb_common_args args = { cb, in, inlen }; + struct npn_select_cb_common_args args; + + args.cb = cb; + args.in = in; + args.inlen = inlen; selected = rb_protect(npn_select_cb_common_i, (VALUE)&args, &status); if (status) { |