shyouhei	2009-01-04 04:48:32 +0900 (Sun, 04 Jan 2009)

  New Revision: 21292

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21292

  Log:
    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]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/version.h
    branches/ruby_1_8_6/win32/win32.c

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21291)
+++ ruby_1_8_6/ChangeLog	(revision 21292)
@@ -1,3 +1,10 @@
+Sun Jan  4 04:47:57 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@d...>
 
 	* lib/date.rb (Date::Infinity#<=>): didn't work.  A patch from
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21291)
+++ ruby_1_8_6/version.h	(revision 21292)
@@ -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[];
Index: ruby_1_8_6/win32/win32.c
===================================================================
--- ruby_1_8_6/win32/win32.c	(revision 21291)
+++ ruby_1_8_6/win32/win32.c	(revision 21292)
@@ -1640,15 +1640,7 @@
 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 @@
 rb_w32_rewinddir(DIR *dirp)
 {
     dirp->curr = dirp->start;
+    dirp->loc = 0;
 }
 
 //

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/