diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-07-05 16:59:56 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-07-05 16:59:56 +0000 |
| commit | c492992f13f8a270e535fb49a50315c247e3848b (patch) | |
| tree | de1653f49b1940cee039b3fdbb9e8d66020026ce /winsup/cygwin/include/sys/dirent.h | |
| parent | c8fe6dc446e6e106514dcc8755c682e6d8455268 (diff) | |
| download | cygnal-c492992f13f8a270e535fb49a50315c247e3848b.tar.gz cygnal-c492992f13f8a270e535fb49a50315c247e3848b.tar.bz2 cygnal-c492992f13f8a270e535fb49a50315c247e3848b.zip | |
Align seekdir and telldir API to POSIX definition.
* Makefile.in (NEW_FUNCTIONS): Remove seekdir and telldir mappings.
* dir.cc (telldir): Move functionality from telldir64 here. Use
long, rather than _off_t.
(telldir64): Just call telldir. Only keep for backward compatibility.
(seekdir): Move functionality from seekdir64 here. Use long, rather
than _off_t.
(seekdir64): Just call seekdir. Only keep for backward compatibility.
* fhandler.h: Throughout, change prototypes of seekdir and telldir
methods to use long, rather than _off64_t.
* fhandler_disk_file.cc: Change aforementioned methods accordingly.
* fhandler_netdrive.cc: Ditto.
* fhandler_registry.cc: Ditto.
* fhandler_virtual.cc: Ditto.
* include/sys/dirent.h (struct __DIR): Change __d_position from
_off_t to long to reflect API change.
(telldir): Change prototype to use long, rather than off_t.
(seekdir): Ditto.
Diffstat (limited to 'winsup/cygwin/include/sys/dirent.h')
| -rw-r--r-- | winsup/cygwin/include/sys/dirent.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index fa059ec30..3d441a20c 100644 --- a/winsup/cygwin/include/sys/dirent.h +++ b/winsup/cygwin/include/sys/dirent.h @@ -38,7 +38,7 @@ typedef struct __DIR unsigned long __d_cookie; struct dirent *__d_dirent; char *__d_dirname; /* directory name with trailing '*' */ - _off_t __d_position; /* used by telldir/seekdir */ + long __d_position; /* used by telldir/seekdir */ int __d_fd; unsigned __d_internal; void *__handle; @@ -58,8 +58,8 @@ int dirfd (DIR *); #ifndef _POSIX_SOURCE #ifndef __INSIDE_CYGWIN__ -off_t telldir (DIR *); -void seekdir (DIR *, off_t loc); +long telldir (DIR *); +void seekdir (DIR *, long loc); #endif int scandir (const char *__dir, |