usa	2011-07-08 14:41:52 +0900 (Fri, 08 Jul 2011)

  New Revision: 32451

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

  Log:
    * win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
      mixed.

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32450)
+++ ChangeLog	(revision 32451)
@@ -1,3 +1,8 @@
+Fri Jul  8 14:40:39 2011  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
+	  mixed.
+
 Fri Jul  8 14:29:47 2011  Narihiro Nakamura  <authornari@g...>
 
 	* configure.in: can't subtract void *.
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 32450)
+++ win32/win32.c	(revision 32451)
@@ -5642,18 +5642,13 @@
 	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
 	    SetFileAttributesW(path, attr & ~FILE_ATTRIBUTE_READONLY);
 	}
-	if (DeleteFileW(path) == FALSE) {
+	if (!DeleteFileW(path)) {
 	    errno = map_errno(GetLastError());
 	    ret = -1;
 	    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
 		SetFileAttributesW(path, attr);
 	    }
 	}
-	else {
-	    while (GetFileAttributesW(path) != (DWORD)-1 || GetLastError() != ERROR_FILE_NOT_FOUND) {
-		Sleep(0);
-	    }
-	}
     });
     return ret;
 }

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