* dirent.h: Change the rest of the d_ino's to __deprecated_d_ino.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7886e4d1f7837f8e44b0b6800fc834d441873111..ca73d2854824caba69766a166c029a6c695f5c41 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-10  Christopher Faylor  <cgf@timesys.com>
+
+       * dirent.h: Change the rest of the d_ino's to __deprecated_d_ino.
+
 2005-12-10  Christopher Faylor  <cgf@timesys.com>
 
        * malloc.cc: Update to version 2.8.3.
@@ -129,6 +133,7 @@
        obsolescence of d_ino.
        (CYGWIN_VERSION_USER_API_VERSION_COMBINED): New convenience macro.
        (CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO): New convenience macro.
+       * include/sys/dirent.h: Change d_ino field to __deprecated_d_ino.
 
 2005-12-05  Christopher Faylor  <cgf@timesys.com>
 

diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h
index 50cde2882a59754a17f48afd0812d57531f001bd..c53650ad94001d365294d9afae0ebed07f84084d 100644 (file)
--- a/winsup/cygwin/include/sys/dirent.h
+++ b/winsup/cygwin/include/sys/dirent.h
@@ -1,6 +1,6 @@
 /* Posix dirent.h for WIN32.
 
-   Copyright 2001, 2002, 2003 Red Hat, Inc.
+   Copyright 2001, 2002, 2003, 2005 Red Hat, Inc.
 
    This software is a copyrighted work licensed under the terms of the
    Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
@@ -20,7 +20,7 @@
 struct dirent
 {
   long d_version;      /* Used since Cygwin 1.3.3. */
-  __ino64_t __deprecated_d_ino;        /* still junk but with more bits */
+  __ino64_t __deprecated_d_ino;
   long d_fd;           /* File descriptor of open directory.
                           Used since Cygwin 1.3.3. */
   unsigned __ino32;
@@ -31,7 +31,7 @@ struct dirent
 struct dirent
 {
   long d_version;
-  ino_t d_ino;
+  ino_t __deprecated_d_ino;
   long d_fd;
   unsigned long __ino32;
   char d_name[256];
@@ -42,7 +42,7 @@ struct dirent
   long d_version;
   long d_reserved[2];
   long d_fd;
-  ino_t d_ino;
+  ino_t __deprecated_d_ino;
   char d_name[256];
 };
 #endif