diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-12-22 07:52:06 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-12-22 07:52:14 +0900 |
| commit | a29b9e5efe286e8ad1b0d67c38f03cbb70951076 (patch) | |
| tree | 0d538803b23972b8b7453d7015286895a1e6848c /spec | |
| parent | c34c6a89cb7524050dc6f174da53a8159a7bbd64 (diff) | |
| download | ruby-a29b9e5efe286e8ad1b0d67c38f03cbb70951076.tar.gz | |
Remvoed no longer needed version guards
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/ruby/optional/capi/ext/constants_spec.c | 4 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/ext/rubyspec.h | 8 | ||||
| -rw-r--r-- | spec/ruby/optional/capi/ext/struct_spec.c | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/spec/ruby/optional/capi/ext/constants_spec.c b/spec/ruby/optional/capi/ext/constants_spec.c index 27899ca4d9..9aee8db37f 100644 --- a/spec/ruby/optional/capi/ext/constants_spec.c +++ b/spec/ruby/optional/capi/ext/constants_spec.c @@ -59,9 +59,7 @@ defconstfunc(rb_mErrno) defconstfunc(rb_eException) defconstfunc(rb_eFatal) defconstfunc(rb_eFloatDomainError) -#ifdef RUBY_VERSION_IS_2_5 defconstfunc(rb_eFrozenError) -#endif defconstfunc(rb_eIndexError) defconstfunc(rb_eInterrupt) defconstfunc(rb_eIOError) @@ -144,9 +142,7 @@ void Init_constants_spec(void) { rb_define_method(cls, "rb_eException", constants_spec_rb_eException, 0); rb_define_method(cls, "rb_eFatal", constants_spec_rb_eFatal, 0); rb_define_method(cls, "rb_eFloatDomainError", constants_spec_rb_eFloatDomainError, 0); - #ifdef RUBY_VERSION_IS_2_5 rb_define_method(cls, "rb_eFrozenError", constants_spec_rb_eFrozenError, 0); - #endif rb_define_method(cls, "rb_eIndexError", constants_spec_rb_eIndexError, 0); rb_define_method(cls, "rb_eInterrupt", constants_spec_rb_eInterrupt, 0); rb_define_method(cls, "rb_eIOError", constants_spec_rb_eIOError, 0); diff --git a/spec/ruby/optional/capi/ext/rubyspec.h b/spec/ruby/optional/capi/ext/rubyspec.h index 4f75d40e55..b4d604e647 100644 --- a/spec/ruby/optional/capi/ext/rubyspec.h +++ b/spec/ruby/optional/capi/ext/rubyspec.h @@ -34,14 +34,6 @@ #define RUBY_VERSION_IS_2_6 #endif -#if RUBY_VERSION_MAJOR > 2 || (RUBY_VERSION_MAJOR == 2 && RUBY_VERSION_MINOR >= 5) -#define RUBY_VERSION_IS_2_5 -#endif - -#if RUBY_VERSION_MAJOR > 2 || (RUBY_VERSION_MAJOR == 2 && RUBY_VERSION_MINOR >= 4) -#define RUBY_VERSION_IS_2_4 -#endif - #if defined(__cplusplus) && !defined(RUBY_VERSION_IS_2_7) /* Ruby < 2.7 needs this to let these function with callbacks and compile in C++ code */ #define rb_define_method(mod, name, func, argc) rb_define_method(mod, name, RUBY_METHOD_FUNC(func), argc) diff --git a/spec/ruby/optional/capi/ext/struct_spec.c b/spec/ruby/optional/capi/ext/struct_spec.c index b9c3b902bf..0393d6937d 100644 --- a/spec/ruby/optional/capi/ext/struct_spec.c +++ b/spec/ruby/optional/capi/ext/struct_spec.c @@ -62,12 +62,10 @@ static VALUE struct_spec_rb_struct_new(VALUE self, VALUE klass, return rb_struct_new(klass, a, b, c); } -#ifdef RUBY_VERSION_IS_2_4 static VALUE struct_spec_rb_struct_size(VALUE self, VALUE st) { return rb_struct_size(st); } -#endif void Init_struct_spec(void) { VALUE cls = rb_define_class("CApiStructSpecs", rb_cObject); @@ -79,9 +77,7 @@ void Init_struct_spec(void) { rb_define_method(cls, "rb_struct_define", struct_spec_struct_define, 4); rb_define_method(cls, "rb_struct_define_under", struct_spec_struct_define_under, 5); rb_define_method(cls, "rb_struct_new", struct_spec_rb_struct_new, 4); -#ifdef RUBY_VERSION_IS_2_4 rb_define_method(cls, "rb_struct_size", struct_spec_rb_struct_size, 1); -#endif } #ifdef __cplusplus |