diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 05:04:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 05:04:37 +0000 |
| commit | 1cca2abf3525cfc2c899f4a0ece2b5c902c45420 (patch) | |
| tree | 24cfc57ed1f0bc41412e9310b653021be2957d64 /ext | |
| parent | 01828cf45ab6d002b2d9f2907581db5e841cb57f (diff) | |
merge revision(s) 50338: [Backport #12253]
tkutil.c: revert r48250
* ext/tk/tkutil/tkutil.c (Init_tkutil): TkUtil::CallbackSubst and
TkUtil::CallbackSubst::Info need the default allocator.
[ruby-list:50115]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/tkutil/tkutil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index d2c447c3f8..bab68dd145 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -1774,10 +1774,10 @@ Init_tkutil(void) ID_call = rb_intern("call"); /* --------------------- */ - cCB_SUBST = rb_define_class_under(mTK, "CallbackSubst", rb_cData); + cCB_SUBST = rb_define_class_under(mTK, "CallbackSubst", rb_cObject); rb_define_singleton_method(cCB_SUBST, "inspect", cbsubst_inspect, 0); - cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cData); + cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cObject); rb_define_singleton_method(cSUBST_INFO, "inspect", substinfo_inspect, 0); ID_SUBST_INFO = rb_intern("SUBST_INFO"); |