aboutsummaryrefslogtreecommitdiff
path: root/locale/programs
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-10-30 15:48:33 +0100
committerFlorian Weimer <fweimer@redhat.com>2017-10-30 15:48:33 +0100
commit4484b9e29656980f18bb0fc8cdb6b1bbe5364f21 (patch)
tree3780df60b52f271014d0ccb66456fe7d6e41b5cf /locale/programs
parent68fe16dd327c895c08b9ee443b234c49c13b36e9 (diff)
downloadglibc-4484b9e29656980f18bb0fc8cdb6b1bbe5364f21.zip
glibc-4484b9e29656980f18bb0fc8cdb6b1bbe5364f21.tar.gz
glibc-4484b9e29656980f18bb0fc8cdb6b1bbe5364f21.tar.bz2
Assume that _DIRENT_HAVE_D_TYPE is always defined.
References remain in io/fts.c, io/ftw.c, posix/glob.c, sysdeps/posix/getcwd.c. These files are (potentially) externally shared.
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/charmap-dir.c2
-rw-r--r--locale/programs/locale.c2
-rw-r--r--locale/programs/locarchive.c4
3 files changed, 0 insertions, 8 deletions
diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
index a9212b7..42639fb 100644
--- a/locale/programs/charmap-dir.c
+++ b/locale/programs/charmap-dir.c
@@ -115,11 +115,9 @@ charmap_readdir (CHARMAP_DIR *cdir)
stpcpy (stpcpy (cdir->pathname, cdir->directory), dirent->d_name);
filename = cdir->pathname + cdir->directory_len;
-#ifdef _DIRENT_HAVE_D_TYPE
if (dirent->d_type != DT_UNKNOWN && dirent->d_type != DT_LNK)
mode = DTTOIF (dirent->d_type);
else
-#endif
{
struct stat64 statbuf;
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 939214d..de2a305 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -316,11 +316,9 @@ select_dirs (const struct dirent *dirent)
{
mode_t mode = 0;
-#ifdef _DIRENT_HAVE_D_TYPE
if (dirent->d_type != DT_UNKNOWN && dirent->d_type != DT_LNK)
mode = DTTOIF (dirent->d_type);
else
-#endif
{
struct stat64 st;
char buf[sizeof (COMPLOCALEDIR)
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 633c59b..50e975d 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -1385,17 +1385,13 @@ add_locales_to_archive (size_t nlist, char *list[], bool replace)
a directory we have to look at a file with the
prefix "SYS_". Otherwise we have found what we
are looking for. */
-#ifdef _DIRENT_HAVE_D_TYPE
d_type = d->d_type;
if (d_type != DT_REG)
-#endif
{
char fullname[fnamelen + 2 * strlen (d->d_name) + 7];
-#ifdef _DIRENT_HAVE_D_TYPE
if (d_type == DT_UNKNOWN)
-#endif
{
strcpy (stpcpy (stpcpy (fullname, fname), "/"),
d->d_name);