From fc74ef93b6945dfac299433a9418fdd31798f6b6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 16 Nov 2010 20:13:36 -0600 Subject: dirent usage cleanup We were including the header in a lot of places it is no longer used. Additionally, use the correct autoconf macro for determining whether d_type is available as a member: HAVE_STRUCT_DIRENT_D_TYPE. Signed-off-by: Dan McGee Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- configure.ac | 1 + lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/sync.c | 1 - src/pacman/callback.c | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4b..e8541d20 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,7 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_STRUCT_TM AC_TYPE_UID_T +AC_STRUCT_DIRENT_D_TYPE # Checks for library functions. AC_FUNC_FORK diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 22127520..988248d8 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -340,7 +340,7 @@ static int checkdbdir(pmdb_t *db) static int is_dir(const char *path, struct dirent *entry) { -#ifdef DT_DIR +#ifdef HAVE_STRUCT_DIRENT_D_TYPE return(entry->d_type == DT_DIR); #else char buffer[PATH_MAX]; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index bd8d132d..b6c99372 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 79d20d49..1e7d3a2b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 8609ed53..2f307750 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -31,7 +31,6 @@ #include /* intmax_t */ #include #include -#include /* libalpm */ #include "sync.h" diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb50..925f1fcf 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -26,7 +26,6 @@ #include #include /* off_t */ #include -#include #include #include -- cgit v1.2.3-70-g09d2