Remove old compatibility DIRECT macro.

Use struct dirent directly.  See parent commit.

Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>

diff --git a/lib/defines.h b/lib/defines.h
index c35f572d6db34db40681abf6e810987949fabeb5..e4937e1c326afa045683132dd053d9e181458daf 100644 (file)
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -118,7 +118,6 @@ static inline void memzero(void *ptr, size_t size)
 #define strzero(s) memzero(s, strlen(s))       /* warning: evaluates twice */
 
 #include <dirent.h>
-#define DIRECT dirent
 
 /*
  * Possible cases:

diff --git a/libmisc/chowndir.c b/libmisc/chowndir.c
index 3a62d5450b1092beeb41c070577b2fd452576732..0edc3b609d8f8b00cd960de68b0c51e8c6113223 100644 (file)
--- a/libmisc/chowndir.c
+++ b/libmisc/chowndir.c
@@ -39,7 +39,7 @@ int chown_tree (const char *root,
        char *new_name;
        size_t new_name_len;
        int rc = 0;
-       struct DIRECT *ent;
+       struct dirent *ent;
        struct stat sb;
        DIR *dir;
 

diff --git a/libmisc/copydir.c b/libmisc/copydir.c
index 90ba2fcd0350f567109665d52a6379f1ab928fad..a5f1b3daddfadc727303ad10c2bb051e47602e83 100644 (file)
--- a/libmisc/copydir.c
+++ b/libmisc/copydir.c
@@ -213,7 +213,7 @@ int copy_tree (const char *src_root, const char *dst_root,
 {
        int err = 0;
        bool set_orig = false;
-       struct DIRECT *ent;
+       struct dirent *ent;
        DIR *dir;
 
        if (copy_root) {

diff --git a/libmisc/remove_tree.c b/libmisc/remove_tree.c
index c3aa81312e115823e1982e2e19bd9c86220bd9ae..04bc7fc4a0c796fef1b5c2db0dc93c71f756219e 100644 (file)
--- a/libmisc/remove_tree.c
+++ b/libmisc/remove_tree.c
@@ -33,7 +33,7 @@ int remove_tree (const char *root, bool remove_root)
 {
        char *new_name = NULL;
        int err = 0;
-       struct DIRECT *ent;
+       struct dirent *ent;
        struct stat sb;
        DIR *dir;