diff options
| author | Benoit Daloze <eregontp@gmail.com> | 2019-10-26 20:53:01 +0200 |
|---|---|---|
| committer | Benoit Daloze <eregontp@gmail.com> | 2019-10-26 20:53:01 +0200 |
| commit | 664e96b1de816c813c29f61e16a2031a7af7ba86 (patch) | |
| tree | 7f4691847cd6b3282812eea7e2be3758e08d1433 /spec/ruby/optional | |
| parent | 3eb0d50c0baae916f4486c264605b18e77bee0dc (diff) | |
| download | ruby-664e96b1de816c813c29f61e16a2031a7af7ba86.tar.gz | |
Update to ruby/spec@28a728b
Diffstat (limited to 'spec/ruby/optional')
| -rw-r--r-- | spec/ruby/optional/capi/ext/io_spec.c | 8 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/ext/kernel_spec.c | 2 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/ext/util_spec.c | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/spec/ruby/optional/capi/ext/io_spec.c b/spec/ruby/optional/capi/ext/io_spec.c index a8f5a29145..b656de081a 100644 --- a/spec/ruby/optional/capi/ext/io_spec.c +++ b/spec/ruby/optional/capi/ext/io_spec.c @@ -21,7 +21,7 @@ static int set_non_blocking(int fd) { int flags = 1; return ioctl(fd, FIOBIO, &flags); #else -# define SET_NON_BLOCKING_FAILS_ALWAYS 1 +#define SET_NON_BLOCKING_FAILS_ALWAYS 1 errno = ENOSYS; return -1; #endif @@ -115,13 +115,13 @@ VALUE io_spec_rb_io_taint_check(VALUE self, VALUE io) { #define RB_IO_WAIT_READABLE_BUF 13 -#if SET_NON_BLOCKING_FAILS_ALWAYS +#ifdef SET_NON_BLOCKING_FAILS_ALWAYS NORETURN(VALUE io_spec_rb_io_wait_readable(VALUE self, VALUE io, VALUE read_p)); #endif VALUE io_spec_rb_io_wait_readable(VALUE self, VALUE io, VALUE read_p) { int fd = io_spec_get_fd(io); -#if !SET_NON_BLOCKING_FAILS_ALWAYS +#ifndef SET_NON_BLOCKING_FAILS_ALWAYS char buf[RB_IO_WAIT_READABLE_BUF]; int ret, saved_errno; #endif @@ -129,7 +129,7 @@ VALUE io_spec_rb_io_wait_readable(VALUE self, VALUE io, VALUE read_p) { if (set_non_blocking(fd) == -1) rb_sys_fail("set_non_blocking failed"); -#if !SET_NON_BLOCKING_FAILS_ALWAYS +#ifndef SET_NON_BLOCKING_FAILS_ALWAYS if(RTEST(read_p)) { if (read(fd, buf, RB_IO_WAIT_READABLE_BUF) != -1) { return Qnil; diff --git a/spec/ruby/optional/capi/ext/kernel_spec.c b/spec/ruby/optional/capi/ext/kernel_spec.c index 0e8827c613..63a2ff8432 100644 --- a/spec/ruby/optional/capi/ext/kernel_spec.c +++ b/spec/ruby/optional/capi/ext/kernel_spec.c @@ -97,7 +97,7 @@ VALUE kernel_spec_call_proc_with_catch_obj(RB_BLOCK_CALL_FUNC_ARGLIST(arg, data) } VALUE kernel_spec_rb_catch_obj(VALUE self, VALUE obj, VALUE main_proc) { - return rb_catch_obj(obj, kernel_spec_call_proc_with_catch, main_proc); + return rb_catch_obj(obj, kernel_spec_call_proc_with_catch_obj, main_proc); } VALUE kernel_spec_rb_eval_string(VALUE self, VALUE str) { diff --git a/spec/ruby/optional/capi/ext/util_spec.c b/spec/ruby/optional/capi/ext/util_spec.c index e579b5e0af..f3c6a1ba58 100644 --- a/spec/ruby/optional/capi/ext/util_spec.c +++ b/spec/ruby/optional/capi/ext/util_spec.c @@ -16,14 +16,15 @@ VALUE util_spec_rb_scan_args(VALUE self, VALUE argv, VALUE fmt, VALUE expected, args[i] = rb_ary_entry(argv, i); } - if (*RSTRING_PTR(fmt) == 'k') { #ifdef RB_SCAN_ARGS_KEYWORDS + if (*RSTRING_PTR(fmt) == 'k') { result = rb_scan_args_kw(RB_SCAN_ARGS_KEYWORDS, argc, args, RSTRING_PTR(fmt)+1, &a1, &a2, &a3, &a4, &a5, &a6); + } else { #endif - } - else { result = rb_scan_args(argc, args, RSTRING_PTR(fmt), &a1, &a2, &a3, &a4, &a5, &a6); +#ifdef RB_SCAN_ARGS_KEYWORDS } +#endif switch(NUM2INT(expected)) { case 6: |