diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | djgpp/config.sed | 2 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Dec 6 18:07:13 2000 WATANABE Hirofumi <eban@ruby-lang.org> + + * djgpp/config.sed, win32/Makefile.sub: typo. + + * eval.c (rb_mod_define_method): avoid VC4.0 warnings. + Mon Dec 4 13:44:01 2000 WATANABE Hirofumi <eban@ruby-lang.org> * lib/jcode.rb: consider multibyte. not /n. diff --git a/djgpp/config.sed b/djgpp/config.sed index fac523e8a5..0713759f16 100644 --- a/djgpp/config.sed +++ b/djgpp/config.sed @@ -1,4 +1,4 @@ -/^SHELL/s,/bin/sh,$(COMPSEC), +/^SHELL/s,/bin/sh,$(COMSPEC), s%@srcdir@%.%g s%@top_srcdir@%..% s%@CFLAGS@%-O2%g @@ -6585,10 +6585,10 @@ rb_mod_define_method(argc, argv, mod) if (TYPE(body) != T_DATA) { /* type error */ } - if (RDATA(body)->dmark == bm_mark) { + if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) { rb_add_method(mod, id, NEW_DMETHOD(method_unbind(body)), NOEX_PUBLIC); } - else if (RDATA(body)->dmark != blk_mark) { + else if (RDATA(body)->dmark != (RUBY_DATA_FUNC)blk_mark) { rb_add_method(mod, id, NEW_BMETHOD(body), NOEX_PUBLIC); } else { diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c744554a7a..f8ebcd7815 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1,4 +1,4 @@ -SHELL = $(COMPSEC) +SHELL = $(COMSPEC) #### Start of system configuration section. #### |