diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/include/fts.h | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
| download | cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.tar.gz cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.tar.bz2 cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.zip | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/include/fts.h')
| -rw-r--r-- | winsup/cygwin/include/fts.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/winsup/cygwin/include/fts.h b/winsup/cygwin/include/fts.h index d4900bb24..57e9096b4 100644 --- a/winsup/cygwin/include/fts.h +++ b/winsup/cygwin/include/fts.h @@ -41,7 +41,7 @@ typedef struct { struct _ftsent *fts_cur; /* current node */ struct _ftsent *fts_child; /* linked list of children */ struct _ftsent **fts_array; /* sort array */ - __dev32_t fts_dev; /* starting device # */ + dev_t fts_dev; /* starting device # */ char *fts_path; /* path for this descent */ int fts_rfd; /* fd for root */ int fts_pathlen; /* sizeof(path) */ @@ -88,8 +88,8 @@ typedef struct _ftsent { u_short fts_pathlen; /* strlen(fts_path) */ u_short fts_namelen; /* strlen(fts_name) */ - __ino64_t fts_ino; /* inode */ - __dev32_t fts_dev; /* device */ + ino_t fts_ino; /* inode */ + dev_t fts_dev; /* device */ nlink_t fts_nlink; /* link count */ #define FTS_ROOTPARENTLEVEL -1 @@ -123,11 +123,7 @@ typedef struct _ftsent { #define FTS_SKIP 4 /* discard node */ u_short fts_instr; /* fts_set() instructions */ -#ifdef __INSIDE_CYGWIN__ - struct __stat64 *fts_statp; /* stat(2) information */ -#else struct stat *fts_statp; /* stat(2) information */ -#endif char *fts_name; /* file name */ FTS *fts_fts; /* back pointer to main FTS */ } FTSENT; |