From 832dd7e69fee43ced0ed71db43098277392658ec Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 31 Jan 2006 08:56:22 +0000 Subject: [PATCH] * dir.cc (readdir_worker): Add comment about writing old 32 bit d_ino. * include/cygwin/version.h: Bump API minor number to 152. (CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO): Remove. --- winsup/cygwin/dir.cc | 2 ++ winsup/cygwin/include/cygwin/version.h | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index eb665b91f..0b588b5fc 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -138,6 +138,8 @@ readdir_worker (DIR *dir, dirent *de) } } } + /* This fills out the old 32 bit d_ino field for old applications, + build under Cygwin before 1.5.x. */ de->__d_internal1 = de->d_ino; return res; diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 797dd37c0..f37d7cee3 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -94,9 +94,6 @@ details. */ #define CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES \ (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 138) -#define CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO \ - (CYGWIN_VERSION_USER_API_VERSION_COMBINED < 147) - /* API_MAJOR 0.0: Initial version. API_MINOR changes: 1: Export cygwin32_ calls as cygwin_ as well. 2: Export j1, jn, y1, yn. @@ -279,20 +276,21 @@ details. */ 143: Export clock_getres, clock_setres 144: Export timelocal, timegm. 145: Add MAP_NORESERVE flag to mmap. - 146: Change SI_USER definition. FIXME: Need to develop compatibility macro - for this? - 147: Eliminate problematic d_ino from dirent structure. unsetenv now returns - int, as per linux. + 146: Change SI_USER definition. FIXME: Need to develop compatibility + macro for this? + 147: Eliminate problematic d_ino from dirent structure. unsetenv now + returns int, as per linux. 148: Add open(2) flags O_SYNC, O_RSYNC, O_DSYNC and O_DIRECT. 149: Add open(2) flag O_NOFOLLOW. 150: Export getsubopt. 151: Export __opendir_with_d_ino + 152: Revert to having d_ino in dirent unconditionally. */ /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 151 +#define CYGWIN_VERSION_API_MINOR 152 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible