summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/stringio/stringio.c5
-rw-r--r--lib/mkmf.rb3
-rw-r--r--version.h4
4 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 16831a8a35f..a79f4b47764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 24 01:16:14 2002 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_mark): must check if ptr is NULL
+ first. [ruby-talk:38873]
+
+ * lib/mkmf.rb (create_makefile): should print depend file when
+ make is other than nmake.
+
Wed Apr 24 00:37:12 2002 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 11fe8ef4555..07ee38dd488 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -53,7 +53,9 @@ static void
strio_mark(ptr)
struct StringIO *ptr;
{
- rb_gc_mark(ptr->string);
+ if (ptr) {
+ rb_gc_mark(ptr->string);
+ }
}
static void
@@ -181,7 +183,6 @@ static VALUE
strio_s_allocate(klass)
VALUE klass;
{
- struct StringIO *ptr;
return Data_Wrap_Struct(klass, strio_mark, strio_free, 0);
}
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 66f1f8a03f0..8889ca17caa 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -631,7 +631,8 @@ EOMF
mfile.printf "###\n"
while line = dfile.gets()
line.gsub!(/\.o\b/, ".#{$OBJEXT}")
- mfile.printf "%s", line.gsub(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if /nmake/i =~ $make
+ line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if /nmake/i =~ $make
+ mfile.printf "%s", line
end
dfile.close
end
diff --git a/version.h b/version.h
index bedd1f59546..6f4edbced3b 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.2"
-#define RUBY_RELEASE_DATE "2002-04-19"
+#define RUBY_RELEASE_DATE "2002-04-23"
#define RUBY_VERSION_CODE 172
-#define RUBY_RELEASE_CODE 20020419
+#define RUBY_RELEASE_CODE 20020423