diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-08-07 23:03:35 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-08-07 23:03:35 +0000 |
| commit | 93df14eee81cf5514fe96e9143201a75d9391c7b (patch) | |
| tree | 240efc52c1b36d04a542037116e600d1e90d1079 /sysdeps/unix/sysv/linux/getdents.c | |
| parent | a281decc878cf26cae12a5bdf5f4c6e0297303d6 (diff) | |
| download | glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.tar glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.tar.gz glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.tar.bz2 glibc-93df14eee81cf5514fe96e9143201a75d9391c7b.zip | |
Remove some pre-2.6.16 Linux kernel conditionals.
Diffstat (limited to 'sysdeps/unix/sysv/linux/getdents.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/getdents.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c index ac4979efb2..babfbd0a43 100644 --- a/sysdeps/unix/sysv/linux/getdents.c +++ b/sysdeps/unix/sysv/linux/getdents.c @@ -97,7 +97,6 @@ __GETDENTS (int fd, char *buf, size_t nbytes) { ssize_t retval; -#ifdef __ASSUME_GETDENTS32_D_TYPE /* The d_ino and d_off fields in kernel_dirent and dirent must have the same sizes and alignments. */ if (sizeof (DIRENT_TYPE) == sizeof (struct dirent) @@ -135,7 +134,6 @@ __GETDENTS (int fd, char *buf, size_t nbytes) return retval; } -#endif off64_t last_offset = -1; @@ -293,11 +291,7 @@ __GETDENTS (int fd, char *buf, size_t nbytes) DIRENT_SET_DP_INO(dp, kdp->d_ino); dp->d_off = kdp->d_off; dp->d_reclen = new_reclen; -#ifdef __ASSUME_GETDENTS32_D_TYPE dp->d_type = *((char *) kdp + kdp->d_reclen - 1); -#else - dp->d_type = DT_UNKNOWN; -#endif memcpy (dp->d_name, kdp->d_name, kdp->d_reclen - offsetof (struct kernel_dirent, d_name)); |