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

internal.h: use the same declaration as definition

Browse source 
range.c: cast the function type to meet the declaration

This change is for fixing build error on AppVeyor:
https://ci.appveyor.com/project/ruby/ruby/build/1.0.8177

string.c
../string.c(4330) : error C4028: formal parameter 2 different from declaration

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-04-19 16:19:48 +00:00
parent e5de886863
commit 46697c7e26
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal.h
View file

@ -2013,7 +2013,7 @@ VALUE rb_gcd_gmp(VALUE x, VALUE y);
/* internal use */
VALUE rb_setup_fake_str(struct RString *fake_str, const char *name, long len, rb_encoding *enc);
#endif
VALUE rb_str_upto_endless_each(VALUE, VALUE (*each)(), VALUE);
VALUE rb_str_upto_endless_each(VALUE, VALUE (*each)(VALUE, VALUE), VALUE);
/* thread.c (export) */
int ruby_thread_has_gvl_p(void); /* for ext/fiddle/closure.c */

6
range.c
View file

@ -432,7 +432,7 @@ range_step(int argc, VALUE *argv, VALUE range)
iter[1] = step;
if (NIL_P(e)) {
rb_str_upto_endless_each(rb_sym2str(b), sym_step_i, (VALUE)iter);
rb_str_upto_endless_each(rb_sym2str(b), (VALUE (*)(VALUE, VALUE))sym_step_i, (VALUE)iter);
}
else {
args[0] = rb_sym2str(e);
@ -467,7 +467,7 @@ range_step(int argc, VALUE *argv, VALUE range)
iter[1] = step;
if (NIL_P(e)) {
rb_str_upto_endless_each(b, step_i, (VALUE)iter);
rb_str_upto_endless_each(b, (VALUE (*)(VALUE, VALUE))step_i, (VALUE)iter);
}
else {
args[0] = e;
@ -836,7 +836,7 @@ range_each(VALUE range)
rb_block_call(tmp, rb_intern("upto"), 2, args, each_i, 0);
}
else if (RB_TYPE_P(beg, T_STRING)) {
rb_str_upto_endless_each(beg, each_i, 0);
rb_str_upto_endless_each(beg, (VALUE (*)(VALUE, VALUE))each_i, 0);
}
else goto inf_loop;
}