From 598d8ada314704591ac6eaf2c40dd9b0602490f8 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 6 Dec 2000 09:10:17 +0000
Subject: [PATCH] eban

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 6 ++++++
 djgpp/config.sed   | 2 +-
 eval.c             | 4 ++--
 win32/Makefile.sub | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5284409b0d6dc9..6abc2ce8997580 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 fac523e8a5f543..0713759f1633b0 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 3b975ffcb35578..3ef416552a1cc4 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 c744554a7a8362..f8ebcd78151c43 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1,4 +1,4 @@
-SHELL = $(COMPSEC)
+SHELL = $(COMSPEC)
 
 #### Start of system configuration section. ####