From: Alejandro Colomar <alx.manpages@gmail.com>
Date: Thu, 30 Dec 2021 13:13:36 +0000 (+0100)
Subject: Remove old compatibility DIRECT macro.
X-Git-Tag: 4.12~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5450f9a904f42388c83b507a7be316355bc58f61;p=thirdparty%2Fshadow.git

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 c35f572d6..e4937e1c3 100644
--- 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 3a62d5450..0edc3b609 100644
--- 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 90ba2fcd0..a5f1b3dad 100644
--- 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 c3aa81312..04bc7fc4a 100644
--- 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;