* dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of the MSDOS definition.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6b9c8614837025d12a92e255b27235f20348e664..78eb27f0814b9039a7451ae9993489794cbfa536 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-27  Ken Brown  <kbrown@cornell.edu>
+
+       * dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of
+       the MSDOS definition.
+
 2010-07-25  Christoph Scholtes  <cschol2112@gmail.com>
 
        * minibuf.c (Fread_buffer): Doc fix (bug#6528).

diff --git a/src/dired.c b/src/dired.c
index d4b0ff20db2f62260584b701d97389bc2dfc9516..92a768da5be23195854dc82beba4be43de7297d2 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -72,8 +72,7 @@ extern struct direct *readdir ();
 #endif /* not MSDOS */
 #endif /* not SYSV_SYSTEM_DIR */
 
-/* Some versions of Cygwin don't have d_ino in `struct dirent'.  */
-#if defined(MSDOS) || defined(__CYGWIN__)
+#ifdef MSDOS
 #define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != 0)
 #else
 #define DIRENTRY_NONEMPTY(p) ((p)->d_ino)