summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-03 19:48:32 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-03 19:48:32 +0000
commit1d9b5929b7ef3d5f2017a800e61240a4c9f181b4 (patch)
tree760f320dae37f2452ba65de8f4c8b6e3e5bca1a2
parent08ba6b3f36c513c249d743a9fd6848d5b032ab14 (diff)
merge revision(s) 18301:
* win32/win32.c (rb_w32_telldir): just returns loc. * win32/win32.c (rb_w32_rewinddir): needs to intialize loc. [ruby-core:18041] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--version.h8
-rw-r--r--win32/win32.c11
3 files changed, 13 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index e4c0df635f..a9336cc291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan 4 04:47:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_telldir): just returns loc.
+
+ * win32/win32.c (rb_w32_rewinddir): needs to intialize loc.
+ [ruby-core:18041]
+
Thu Jan 1 08:39:36 2009 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (Date::Infinity#<=>): didn't work. A patch from
diff --git a/version.h b/version.h
index 2291005622..89a87ed8c2 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-01"
+#define RUBY_RELEASE_DATE "2009-01-04"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090101
-#define RUBY_PATCHLEVEL 288
+#define RUBY_RELEASE_CODE 20090104
+#define RUBY_PATCHLEVEL 289
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/win32/win32.c b/win32/win32.c
index 3c16e57df1..c3b8612cac 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1640,15 +1640,7 @@ rb_w32_readdir(DIR *dirp)
long
rb_w32_telldir(DIR *dirp)
{
- long loc = 0; char *p = dirp->curr;
-
- rb_w32_rewinddir(dirp);
-
- while (p != dirp->curr) {
- move_to_next_entry(dirp); loc++;
- }
-
- return loc;
+ return dirp->loc;
}
//
@@ -1673,6 +1665,7 @@ void
rb_w32_rewinddir(DIR *dirp)
{
dirp->curr = dirp->start;
+ dirp->loc = 0;
}
//