From bc5797d873c27631a4b5c7eb0f635e0e5c9e2057 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Apr 2008 00:45:02 +0000
Subject: [PATCH] * dir.c (dir_tell): check if closed.  [ruby-core:16223]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 dir.c     | 2 +-
 version.h | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b296923ae..aa1c41a328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr  6 09:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_tell): check if closed.  [ruby-core:16223]
+
 Sat Apr  5 10:05:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_check_to_integer): backported for range_step.
diff --git a/dir.c b/dir.c
index b61e7c107e..b6e197650b 100644
--- a/dir.c
+++ b/dir.c
@@ -592,7 +592,7 @@ dir_tell(dir)
     struct dir_data *dirp;
     long pos;
 
-    Data_Get_Struct(dir, struct dir_data, dirp);
+    GetDIR(dir, dirp);
     pos = telldir(dirp->dir);
     return rb_int2inum(pos);
 #else
diff --git a/version.h b/version.h
index ea65caf72a..1e7e257fbe 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-04-05"
+#define RUBY_RELEASE_DATE "2008-04-06"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080405
+#define RUBY_RELEASE_CODE 20080406
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];