summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-28 10:37:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-28 10:37:29 +0000
commitd16617c041d3ee3003de50a12f19a2dd42b1b795 (patch)
tree772a85383e3f447e3c63a07469b81a61804efaf8
parent3312f4246af871f9148ca929901dcf3d989a752b (diff)
* win32/win32.c (move_to_next_entry): revert r12338. not necessary
on ruby_1_8_5. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h8
-rw-r--r--win32/win32.c1
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 20aa0b59762..6cad8b0e714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 28 19:37:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (move_to_next_entry): revert r12338. not necessary
+ on ruby_1_8_5.
+
Sun May 27 05:52:37 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* eval.c (mnew): call of super via a method object should work again.
diff --git a/version.h b/version.h
index d7f27fa5dfc..6feb792651c 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-05-23"
+#define RUBY_RELEASE_DATE "2007-05-28"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070527
-#define RUBY_PATCHLEVEL 50
+#define RUBY_RELEASE_CODE 20070528
+#define RUBY_PATCHLEVEL 51
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/win32/win32.c b/win32/win32.c
index e10ece507a2..b88c136467c 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1533,7 +1533,6 @@ static void
move_to_next_entry(DIR *dirp)
{
if (dirp->curr) {
- dirp->loc++;
dirp->curr += strlen(dirp->curr) + 1;
if (dirp->curr >= (dirp->start + dirp->size)) {
dirp->curr = NULL;