aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gc.c2
-rw-r--r--lib/.document1
-rw-r--r--lib/tmpdir.rb3
4 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 16199aa465..875f4eb754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 15 12:35:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
+ segment7.net>. [ruby-core:06894]
+
Thu Dec 15 01:33:31 2005 Tanaka Akira <akr@m17n.org>
* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
diff --git a/gc.c b/gc.c
index 93666cefe7..016b948fed 100644
--- a/gc.c
+++ b/gc.c
@@ -596,7 +596,7 @@ gc_mark_rest(void)
MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX);
init_mark_stack();
- while(p != tmp_arry){
+ while (p != tmp_arry){
p--;
gc_mark_children(*p, 0);
}
diff --git a/lib/.document b/lib/.document
index 14bb46deec..3978aa9347 100644
--- a/lib/.document
+++ b/lib/.document
@@ -39,5 +39,6 @@ thread.rb
thwait.rb
time.rb
timeout.rb
+tmpdir.rb
uri
yaml.rb
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index bee99c41cb..3042ed5202 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -24,6 +24,9 @@ class Dir
rescue LoadError
end
+ ##
+ # Returns the operating system's temporary file path.
+
def Dir::tmpdir
tmp = '.'
if $SAFE > 0