summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-12-06 09:10:17 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-12-06 09:10:17 +0000
commit598d8ada314704591ac6eaf2c40dd9b0602490f8 (patch)
treeeec41855f704ff341615ee87a464a66dd40a7469
parent781ce823dcf986620464a433340d0438b6fe7cd6 (diff)
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--djgpp/config.sed2
-rw-r--r--eval.c4
-rw-r--r--win32/Makefile.sub2
4 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5284409b0d6..6abc2ce8997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 fac523e8a5f..0713759f163 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
diff --git a/eval.c b/eval.c
index 3b975ffcb35..3ef416552a1 100644
--- a/eval.c
+++ b/eval.c
@@ -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 c744554a7a8..f8ebcd78151 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1,4 +1,4 @@
-SHELL = $(COMPSEC)
+SHELL = $(COMSPEC)
#### Start of system configuration section. ####