mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new
character literal (1 char string). * lib/mkmf.rb: shut up some warnings from tk's extconf.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e85f3debc4
commit
f8a90f1c0c
3 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Thu Oct 12 18:25:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new
|
||||||
|
character literal (1 char string).
|
||||||
|
|
||||||
|
* lib/mkmf.rb: shut up some warnings from tk's extconf.rb.
|
||||||
|
|
||||||
Thu Oct 12 02:15:24 2006 Akinori MUSHA <knu@iDaemons.org>
|
Thu Oct 12 02:15:24 2006 Akinori MUSHA <knu@iDaemons.org>
|
||||||
|
|
||||||
* ext/digest/lib/digest/hmac.rb: Make use of String#bytes.
|
* ext/digest/lib/digest/hmac.rb: Make use of String#bytes.
|
||||||
|
|
|
@ -1359,8 +1359,8 @@ cbsubst_table_setup(self, key_inf, proc_inf)
|
||||||
for(idx = 0; idx < len; idx++) {
|
for(idx = 0; idx < len; idx++) {
|
||||||
inf = RARRAY_PTR(key_inf)[idx];
|
inf = RARRAY_PTR(key_inf)[idx];
|
||||||
if (TYPE(inf) != T_ARRAY) continue;
|
if (TYPE(inf) != T_ARRAY) continue;
|
||||||
*(key + real_len) = (char)NUM2INT(RARRAY_PTR(inf)[0]);
|
*(key + real_len) = NUM2CHR(RARRAY_PTR(inf)[0]);
|
||||||
*(type + real_len) = (char)NUM2INT(RARRAY_PTR(inf)[1]);
|
*(type + real_len) = NUM2CHR(RARRAY_PTR(inf)[1]);
|
||||||
|
|
||||||
*(ivar + real_len)
|
*(ivar + real_len)
|
||||||
= rb_intern(
|
= rb_intern(
|
||||||
|
|
|
@ -1043,6 +1043,7 @@ def configuration(srcdir)
|
||||||
CONFIG['PATH_SEPARATOR'] = ';'
|
CONFIG['PATH_SEPARATOR'] = ';'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
CONFIG["hdrdir"] ||= $hdrdir
|
||||||
mk << %{
|
mk << %{
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
||||||
|
@ -1107,7 +1108,7 @@ COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
|
||||||
|
|
||||||
#### End of system configuration section. ####
|
#### End of system configuration section. ####
|
||||||
|
|
||||||
preload = #{$preload ? $preload.join(' ') : ''}
|
preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
|
||||||
}
|
}
|
||||||
if $nmake == ?b
|
if $nmake == ?b
|
||||||
mk.each do |x|
|
mk.each do |x|
|
||||||
|
|
Loading…
Reference in a new issue