From cdb346c65eeb9f976cf3db21b3cb2f7d8837cf6b Mon Sep 17 00:00:00 2001 From: Danny Wilson Date: Sat, 7 Nov 2015 04:51:33 +0100 Subject: Fix build on Solaris d_type is not part of the POSIX spec unfortunately. --- src/libutil/util.cc | 4 ++++ src/libutil/util.hh | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'src/libutil') diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 27116fd18297..d1b67c6d4515 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -232,7 +232,11 @@ DirEntries readDirectory(const Path & path) checkInterrupt(); string name = dirent->d_name; if (name == "." || name == "..") continue; +#ifdef HAVE_STRUCT_DIRENT_D_TYPE entries.emplace_back(name, dirent->d_ino, dirent->d_type); +#else + entries.emplace_back(name, dirent->d_ino, getFileType(absPath(name, path))); +#endif } if (errno) throw SysError(format("reading directory ‘%1%’") % path); diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 038838820899..2edc5344fdc1 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -11,6 +11,12 @@ #include +#ifndef HAVE_STRUCT_DIRENT_D_TYPE +#define DT_UNKNOWN 0 +#define DT_REG 1 +#define DT_LNK 2 +#define DT_DIR 3 +#endif namespace nix { -- cgit 1.4.1