diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-08 03:14:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-08 03:14:45 +0000 |
| commit | ccb6e802afbda172b2d560eab3e979e289d9365e (patch) | |
| tree | d81f1e9950df5d05e5c9fe5c7a09dd09041bac28 | |
| parent | 139579b501c3475aec70a8bc5f102e759a286a85 (diff) | |
| download | ruby-ccb6e802afbda172b2d560eab3e979e289d9365e.tar.gz | |
tk/extconf.rb: outdated checks
* ext/tk/extconf.rb: remove outdated checks.
* ext/tk/tcltklib.c (ip_ruby_cmd): remove longstanding dead code.
ptr and len in RArray were till 1.8 and have_struct_member of
1.8 does not set HAVE_<stuct_name>_<member_name> but only
HAVE_ST_<member_name>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/tk/extconf.rb | 6 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 02851f727f..fc6d04b58a 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1804,12 +1804,6 @@ print("check functions.") end print("\n") # progress -print("check struct members.") -have_struct_member("struct RArray", "ptr", "ruby.h") -print(".") # progress -have_struct_member("struct RArray", "len", "ruby.h") -print("\n") # progress - # check libraries unless is_win32? print("check libraries.") diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index d164e5cd3b..658ba4bffa 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -3636,11 +3636,7 @@ ip_ruby_cmd(clientData, interp, argc, argv) s = rb_tainted_str_new2(str); #endif DUMP2("arg:%s",str); -#ifndef HAVE_STRUCT_RARRAY_LEN rb_ary_push(args, s); -#else - RARRAY(args)->ptr[RARRAY(args)->len++] = s; -#endif } if (old_gc == Qfalse) rb_gc_enable(); |