From ca986c6bf8d1b9227cab7dd8eb91f43632b80b0b Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 30 Jan 2006 13:44:16 +0000
Subject: [PATCH] 	* fhandler_disk_file.cc
 (fhandler_disk_file::rewinddir): Simplify 	conditional.

---
 winsup/cygwin/ChangeLog             | 5 +++++
 winsup/cygwin/fhandler_disk_file.cc | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e9253598a..596b05ab3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::rewinddir): Simplify
+	conditional.
+
 2006-01-30  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (d_cachepos): Rename from d_pos to distinct
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index ff4547630..bc6fc3b31 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1767,7 +1767,7 @@ fhandler_disk_file::rewinddir (DIR *dir)
 {
   if (wincap.is_winnt ())
     d_cachepos (dir) = 0;
-  if (!wincap.is_winnt () && dir->__handle != INVALID_HANDLE_VALUE)
+  else if (dir->__handle != INVALID_HANDLE_VALUE)
     {
       if (dir->__handle)
 	FindClose (dir->__handle);