1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
ngoto 2016-09-16 13:11:28 +00:00
parent 16391af2e2
commit 54fa33ea49
2 changed files with 11 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Fri Sep 16 22:10:31 2016 Naohisa Goto <ngotogenome@gmail.com>
* 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 <ngotogenome@gmail.com> Fri Sep 16 21:28:25 2016 Naohisa Goto <ngotogenome@gmail.com>
* internal.h (MAYBE_UNUSED): The fallback definition is needed. * internal.h (MAYBE_UNUSED): The fallback definition is needed.

View file

@ -636,7 +636,11 @@ ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out,
{ {
VALUE selected; VALUE selected;
int status; 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); selected = rb_protect(npn_select_cb_common_i, (VALUE)&args, &status);
if (status) { if (status) {