diff options
Diffstat (limited to 'winsup/cygwin/dir.cc')
| -rw-r--r-- | winsup/cygwin/dir.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 641aabe4b..c51cff701 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -187,8 +187,9 @@ readdir_r (DIR *dir, dirent *de, dirent **ode) return res; } -extern "C" _off64_t -telldir64 (DIR *dir) +/* telldir */ +extern "C" long +telldir (DIR *dir) { myfault efault; if (efault.faulted (EFAULT)) @@ -199,15 +200,18 @@ telldir64 (DIR *dir) return ((fhandler_base *) dir->__fh)->telldir (dir); } -/* telldir */ -extern "C" _off_t -telldir (DIR *dir) +/* telldir was never defined using off_t in POSIX, only in early versions + of glibc. We have to keep the function in as entry point for backward + compatibility. */ +extern "C" _off64_t +telldir64 (DIR *dir) { - return telldir64 (dir); + return (_off64_t) telldir (dir); } +/* seekdir */ extern "C" void -seekdir64 (DIR *dir, _off64_t loc) +seekdir (DIR *dir, long loc) { myfault efault; if (efault.faulted (EFAULT)) @@ -219,11 +223,13 @@ seekdir64 (DIR *dir, _off64_t loc) return ((fhandler_base *) dir->__fh)->seekdir (dir, loc); } -/* seekdir */ +/* seekdir was never defined using off_t in POSIX, only in early versions + of glibc. We have to keep the function in as entry point for backward + compatibility. */ extern "C" void -seekdir (DIR *dir, _off_t loc) +seekdir64 (DIR *dir, _off64_t loc) { - seekdir64 (dir, (_off64_t)loc); + seekdir (dir, (long) loc); } /* rewinddir: POSIX 5.1.2.1 */ |