summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--version.h2
-rw-r--r--win32/win32.c11
3 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 453af7e02d..84f4a5fa56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan 4 04:49:01 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]
+
Sun Jan 4 04:45:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_select): recalc the rest of timeout for each
diff --git a/version.h b/version.h
index 6ec1a5bc32..52581d21c0 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-01-04"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090104
-#define RUBY_PATCHLEVEL 75
+#define RUBY_PATCHLEVEL 76
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
diff --git a/win32/win32.c b/win32/win32.c
index 498c4b306c..6f29a15f97 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1635,15 +1635,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;
}
//
@@ -1668,6 +1660,7 @@ void
rb_w32_rewinddir(DIR *dirp)
{
dirp->curr = dirp->start;
+ dirp->loc = 0;
}
//